summaryrefslogtreecommitdiff
path: root/framework/java/android/bluetooth/BluetoothMap.java
diff options
context:
space:
mode:
authorMatthew Xie <mattx@google.com>2013-10-10 21:56:19 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-10 21:56:20 +0000
commit0f86e5e8f227fba40a82dde935ee8d346080c64c (patch)
treed6800eb57d38ffe8736e1a5085011fb6789f7231 /framework/java/android/bluetooth/BluetoothMap.java
parent04be95381fa074488fe6180675eafa7e23580960 (diff)
parent86418bac9b6f772f8998b78e1dad07cede88097b (diff)
Merge "Check callback null condition for register/unregsiter state change callback" into klp-dev
Diffstat (limited to 'framework/java/android/bluetooth/BluetoothMap.java')
-rw-r--r--framework/java/android/bluetooth/BluetoothMap.java3
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);