am 8e6a5d31: am 27543d42: am 0223f9c5: Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"

* commit '8e6a5d31344395ffce77caff217a90f5d0d25ab1':
  Bluetooth: GAP: Cancel the pairing notification on bond state change
This commit is contained in:
Matthew Xie
2014-02-24 14:32:13 +00:00
committed by Android Git Automerger
2 changed files with 14 additions and 0 deletions

View File

@@ -103,6 +103,19 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
NotificationManager manager = (NotificationManager) context
.getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(NOTIFICATION_ID);
} else if (BluetoothDevice.ACTION_BOND_STATE_CHANGED.equals(action)) {
int bondState = intent.getIntExtra(BluetoothDevice.EXTRA_BOND_STATE,
BluetoothDevice.ERROR);
int oldState = intent.getIntExtra(BluetoothDevice.EXTRA_PREVIOUS_BOND_STATE,
BluetoothDevice.ERROR);
if((oldState == BluetoothDevice.BOND_BONDING) &&
(bondState == BluetoothDevice.BOND_NONE)) {
// Remove the notification
NotificationManager manager = (NotificationManager) context
.getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(NOTIFICATION_ID);
}
}
}
}