Merge "Fix bluetooth pairing notification could not be removed" into sc-dev

This commit is contained in:
TreeHugger Robot
2021-05-31 02:07:17 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
} }