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

am a96ba381: Merge "Only add successfully bound profile services to mProfileServices." into lmp-mr1-dev

Browse Source 
* commit 'a96ba381cf7ecbed31da94b8ebc93da3c42151ad':
  Only add successfully bound profile services to mProfileServices.
This commit is contained in:
Benjamin Franz
2014-12-10 20:34:36 +00:00
committed by Android Git Automerger
parent 15cfa4f301 a96ba381cf
commit df55bf45e8
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
services/core/java/com/android/server/BluetoothManagerService.java
View File

@@ -535,15 +535,14 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
Log.d(TAG, "Creating new ProfileServiceConnections object for" Log.d(TAG, "Creating new ProfileServiceConnections object for"
+ " profile: " + bluetoothProfile); + " profile: " + bluetoothProfile);
} }
Intent intent = null;
if (bluetoothProfile == BluetoothProfile.HEADSET) { if (bluetoothProfile != BluetoothProfile.HEADSET) return false;
intent = new Intent(IBluetoothHeadset.class.getName());
} else { Intent intent = new Intent(IBluetoothHeadset.class.getName());
return false;
}
psc = new ProfileServiceConnections(intent); psc = new ProfileServiceConnections(intent);
if (!psc.bindService()) return false;
mProfileServices.put(new Integer(bluetoothProfile), psc); mProfileServices.put(new Integer(bluetoothProfile), psc);
psc.bindService();
} }
} }
@@ -571,7 +570,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
synchronized (mProfileServices) { synchronized (mProfileServices) {
for (Integer i : mProfileServices.keySet()) { for (Integer i : mProfileServices.keySet()) {
ProfileServiceConnections psc = mProfileServices.get(i); ProfileServiceConnections psc = mProfileServices.get(i);
mContext.unbindService(psc); try {
mContext.unbindService(psc);
} catch (IllegalArgumentException e) {
Log.e(TAG, "Unable to unbind service with intent: " + psc.mIntent, e);
}
psc.removeAllProxies(); psc.removeAllProxies();
} }
mProfileServices.clear(); mProfileServices.clear();
@@ -596,16 +599,16 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
mIntent = intent; mIntent = intent;
} }
private void bindService() { private boolean bindService() {
if (mIntent != null && mService == null) { if (mIntent != null && mService == null &&
if (!doBind(mIntent, this, 0, UserHandle.CURRENT_OR_SELF)) { doBind(mIntent, this, 0, UserHandle.CURRENT_OR_SELF)) {
Log.w(TAG, "Unable to bind with intent: " + mIntent
+ ". Triggering retry.");
}
Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE); Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);
msg.obj = this; msg.obj = this;
mHandler.sendMessageDelayed(msg, TIMEOUT_BIND_MS); mHandler.sendMessageDelayed(msg, TIMEOUT_BIND_MS);
return true;
} }
Log.w(TAG, "Unable to bind with intent: " + mIntent);
return false;
} }
private void addProxy(IBluetoothProfileServiceConnection proxy) { private void addProxy(IBluetoothProfileServiceConnection proxy) {