diff options
| author | Matthew Xie <mattx@google.com> | 2013-10-10 15:07:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 15:07:22 -0700 |
| commit | 0a6d99325ce7b04aa5cf491e20d9558b7535ce79 (patch) | |
| tree | d6800eb57d38ffe8736e1a5085011fb6789f7231 /framework/java/android/bluetooth/BluetoothMap.java | |
| parent | 9af11bdc92e2621b081d593f771c2da42fe6c935 (diff) | |
| parent | 0f86e5e8f227fba40a82dde935ee8d346080c64c (diff) | |
am a9a038c2: am bd558e57: am 0f86e5e8: Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev
* commit 'a9a038c275dcc606a92cfe93a9b60a16aae38c4a':
Check callback null condition for register/unregsiter state change callback
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothMap.java')
| -rw-r--r-- | framework/java/android/bluetooth/BluetoothMap.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/framework/java/android/bluetooth/BluetoothMap.java b/framework/java/android/bluetooth/BluetoothMap.java index fac8fd5184..92a2f1e425 100644 --- a/framework/java/android/bluetooth/BluetoothMap.java +++ b/framework/java/android/bluetooth/BluetoothMap.java @@ -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); |