commit f1754050ceaadb4603aaaa0b1f0b193a305834af
author Matthew Xie <mattx@google.com> Wed Sep 14 09:05:27 2011 -0700
committer Matthew Xie <mattx@google.com> Wed Sep 14 09:05:27 2011 -0700
tree 7752711b8e9f9d435bb89278a555207e0007a372
parent 2f2eea704ef82878c7aa909a1f7dbdf19851b0fb

Keep Binder reference in the mServiceRecordToPid hashmap

so that the Binder object does not get destroyed when the thread
that registers the service record ends.
bug 5276332

Change-Id: Id17a4c279e03aa6928dca5bf048c7c90862bd9cf

core/java/android/server/BluetoothService.java

diff --git a/core/java/android/server/BluetoothService.java b/core/java/android/server/BluetoothService.java
index 00d3331..f0fb4e0 100755
--- a/core/java/android/server/BluetoothService.java
+++ b/core/java/android/server/BluetoothService.java
@@ -145,7 +145,7 @@
     private final ArrayList<String> mUuidIntentTracker;
     private final HashMap<RemoteService, IBluetoothCallback> mUuidCallbackTracker;
 
-    private final HashMap<Integer, Integer> mServiceRecordToPid;
+    private final HashMap<Integer, Pair<Integer, IBinder>> mServiceRecordToPid;
 
     private final HashMap<String, BluetoothDeviceProfileState> mDeviceProfileState;
     private final BluetoothProfileState mA2dpProfileState;
@@ -221,7 +221,7 @@
         mDeviceOobData = new HashMap<String, Pair<byte[], byte[]>>();
         mUuidIntentTracker = new ArrayList<String>();
         mUuidCallbackTracker = new HashMap<RemoteService, IBluetoothCallback>();
-        mServiceRecordToPid = new HashMap<Integer, Integer>();
+        mServiceRecordToPid = new HashMap<Integer, Pair<Integer, IBinder>>();
         mDeviceProfileState = new HashMap<String, BluetoothDeviceProfileState>();
         mA2dpProfileState = new BluetoothProfileState(mContext, BluetoothProfileState.A2DP);
         mHfpProfileState = new BluetoothProfileState(mContext, BluetoothProfileState.HFP);
@@ -1516,10 +1516,10 @@
         }
 
         int pid = Binder.getCallingPid();
-        mServiceRecordToPid.put(new Integer(handle), new Integer(pid));
+        mServiceRecordToPid.put(new Integer(handle), new Pair<Integer, IBinder>(pid, b));
         try {
             b.linkToDeath(new Reaper(handle, pid, RFCOMM_RECORD_REAPER), 0);
-        } catch (RemoteException e) {}
+        } catch (RemoteException e) {Log.e(TAG, "", e);}
         return handle;
     }
 
@@ -1532,12 +1532,12 @@
     }
 
     private synchronized void checkAndRemoveRecord(int handle, int pid) {
-        Integer handleInt = new Integer(handle);
-        Integer owner = mServiceRecordToPid.get(handleInt);
+        Pair<Integer, IBinder> pidPair = mServiceRecordToPid.get(handle);
+        Integer owner = pidPair.first;
         if (owner != null && pid == owner.intValue()) {
             if (DBG) Log.d(TAG, "Removing service record " +
                 Integer.toHexString(handle) + " for pid " + pid);
-            mServiceRecordToPid.remove(handleInt);
+            mServiceRecordToPid.remove(handle);
             removeServiceRecordNative(handle);
         }
     }
@@ -1593,6 +1593,7 @@
             try {
                 binder.linkToDeath(new Reaper(pid, STATE_CHANGE_REAPER), 0);
             } catch (RemoteException e) {
+                Log.e(TAG, "", e);
                 return false;
             }
         }
@@ -1867,7 +1868,7 @@
     private void dumpApplicationServiceRecords(PrintWriter pw) {
         pw.println("\n--Application Service Records--");
         for (Integer handle : mServiceRecordToPid.keySet()) {
-            Integer pid = mServiceRecordToPid.get(handle);
+            Integer pid = mServiceRecordToPid.get(handle).first;
             pw.println("\tpid " + pid + " handle " + Integer.toHexString(handle));
         }
         mAdapter.closeProfileProxy(BluetoothProfile.PAN, mBluetoothHeadset);