Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd558e57 authored Oct 10, 2013 by Matthew Xie Committed by Android Git Automerger Oct 10, 2013

am 64be26fa: Merge "Check callback null condition for register/unregsiter...

am 64be26fa: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev

* commit '64be26fa':
  Check callback null condition for register/unregsiter state change callback

parents 2f87ce36 64be26fa

core/java/android/bluetooth/BluetoothA2dp.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -513,7 +513,7 @@ public final class BluetoothA2dp implements BluetoothProfile {
		}
		}

		private ServiceConnection mConnection = new ServiceConnection() {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");
		mService = IBluetoothA2dp.Stub.asInterface(service);

core/java/android/bluetooth/BluetoothHeadset.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -885,7 +885,7 @@ public final class BluetoothHeadset implements BluetoothProfile {
		return false;
		}

		private ServiceConnection mConnection = new ServiceConnection() {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");
		mService = IBluetoothHeadset.Stub.asInterface(service);

core/java/android/bluetooth/BluetoothHealth.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -519,7 +519,7 @@ public final class BluetoothHealth implements BluetoothProfile {
		mServiceListener = null;
		}

		private ServiceConnection mConnection = new ServiceConnection() {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");
		mService = IBluetoothHealth.Stub.asInterface(service);

core/java/android/bluetooth/BluetoothInputDevice.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -458,7 +458,7 @@ public final class BluetoothInputDevice implements BluetoothProfile {
		return BluetoothProfile.PRIORITY_OFF;
		}

		private ServiceConnection mConnection = new ServiceConnection() {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) Log.d(TAG, "Proxy object connected");
		mService = IBluetoothInputDevice.Stub.asInterface(service);

core/java/android/bluetooth/BluetoothMap.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -142,7 +142,6 @@ public final class BluetoothMap implements BluetoothProfile {
		try {
		mService = null;
		mContext.unbindService(mConnection);
		mConnection = null;
		} catch (Exception re) {
		Log.e(TAG,"",re);
		}
		@@ -370,7 +369,7 @@ public final class BluetoothMap implements BluetoothProfile {
		return PRIORITY_OFF;
		}

		private ServiceConnection mConnection = new ServiceConnection() {
		private final ServiceConnection mConnection = new ServiceConnection() {
		public void onServiceConnected(ComponentName className, IBinder service) {
		if (DBG) log("Proxy object connected");
		mService = IBluetoothMap.Stub.asInterface(service);