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

Merge "AdapterService: Only bind HeadsetService in ON state." into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-15 22:34:37 +00:00
committed by Android (Google) Code Review
parent 571afb3b78 620fab24ae
commit 4e3076b1a2
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1174,6 +1174,26 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
}
private boolean bindService() {
int state = BluetoothAdapter.STATE_OFF;
try {
mBluetoothLock.readLock().lock();
if (mBluetooth != null) {
state = mBluetooth.getState();
}
} catch (RemoteException e) {
Slog.e(TAG, "Unable to call getState", e);
return false;
} finally {
mBluetoothLock.readLock().unlock();
}
if (!mEnable || state != BluetoothAdapter.STATE_ON) {
if (DBG) {
Slog.d(TAG, "Unable to bindService while Bluetooth is disabled");
}
return false;
}
if (mIntent != null && mService == null && doBind(mIntent, this, 0,
UserHandle.CURRENT_OR_SELF)) {
Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);