Merge "Bluetooth: Check state correctly when client wants to bind" into rvc-qpr-dev (0c73e5b4) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -1236,7 +1236,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		@Override
		public boolean bindBluetoothProfileService(int bluetoothProfile,
		IBluetoothProfileServiceConnection proxy) {
		if (!mEnable) {
		if (mState != BluetoothAdapter.STATE_ON) {
		if (DBG) {
		Slog.d(TAG, "Trying to bind to profile: " + bluetoothProfile
		+ ", while Bluetooth was disabled");
		@@ -1400,7 +1400,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
		mBluetoothLock.readLock().unlock();
		}

		if (!mEnable \|\| state != BluetoothAdapter.STATE_ON) {
		if (state != BluetoothAdapter.STATE_ON) {
		if (DBG) {
		Slog.d(TAG, "Unable to bindService while Bluetooth is disabled");
		}