Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keep Binder reference in the mServiceRecordToPid hashmap"

Browse Source
This commit is contained in:
Matthew Xie
2011-09-14 10:48:43 -07:00
committed by Android (Google) Code Review
parent 28739171f2 f1754050ce
commit f16e2aea54
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/java/android/server/BluetoothService.java
View File

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