Merge "AdapterService: Only bind HeadsetService in ON state." (1c287376) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/BluetoothManagerService.java

+20 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1161,6 +1161,26 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
	}		}

	private boolean bindService() {		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,		if (mIntent != null && mService == null && doBind(mIntent, this, 0,
	UserHandle.CURRENT_OR_SELF)) {		UserHandle.CURRENT_OR_SELF)) {
	Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);		Message msg = mHandler.obtainMessage(MESSAGE_BIND_PROFILE_SERVICE);