Projects >> frameworks_base_disabled >>d206c874cf517dba3ca70ca55353f88506dd26c4

Chunk
Conflicting content
    private String mOutputFile;
    private String mTag;
<<<<<<< HEAD
=======
    private class HeadsetServiceListener implements ServiceListener {
        private boolean mConnected = false;

        public void onServiceConnected() {
            synchronized (this) {
                mConnected = true;
            }
        }

        public void onServiceDisconnected() {
            synchronized (this) {
                mConnected = false;
            }
        }

        public boolean isConnected() {
            synchronized (this) {
                return mConnected;
            }
        }
    }

    private HeadsetServiceListener mHeadsetServiceListener = new HeadsetServiceListener();
>>>>>>> 82aacddef99e5cfc399d02702f2a336af8fbd59f

    private class BluetoothReceiver extends BroadcastReceiver {
        private int mFiredFlags = 0;
Solution content
    private String mOutputFile;
    private String mTag;

    private class BluetoothReceiver extends BroadcastReceiver {
        private int mFiredFlags = 0;
File
BluetoothTestUtils.java
Developer's decision
Version 1
Kind of conflict
Attribute
Class declaration
Method invocation