Merge "Fix bluetooth pairing notification could not be removed" into sc-dev am: bc587c4d1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14733198 Change-Id: I44e3d8aced8c47621931bd7185632cc4527d29b2
This commit is contained in:
@@ -134,7 +134,8 @@ public final class BluetoothPairingService extends Service {
|
|||||||
mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
|
mDevice = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE);
|
||||||
|
|
||||||
if (mDevice != null && mDevice.getBondState() != BluetoothDevice.BOND_BONDING) {
|
if (mDevice != null && mDevice.getBondState() != BluetoothDevice.BOND_BONDING) {
|
||||||
Log.w(TAG, "Device " + mDevice + " not bonding: " + mDevice.getBondState());
|
Log.w(TAG, "Device " + mDevice.getName() + " not bonding: " + mDevice.getBondState());
|
||||||
|
mNm.cancel(NOTIFICATION_ID);
|
||||||
stopSelf();
|
stopSelf();
|
||||||
return START_NOT_STICKY;
|
return START_NOT_STICKY;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user