PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '27543d42ff79b92e2ec3ddcbe970633b848231e8':
  Bluetooth: GAP: Cancel the pairing notification on bond state change
This commit is contained in:
Matthew Xie
2014-02-24 14:29:06 +00:00
committed by Android Git Automerger
parent c3e8fd2599 27543d42ff
commit 8e6a5d3134
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidManifest.xml
View File

@@ -1297,6 +1297,7 @@
<intent-filter> <intent-filter>
<action android:name="android.bluetooth.device.action.PAIRING_REQUEST" /> <action android:name="android.bluetooth.device.action.PAIRING_REQUEST" />
<action android:name="android.bluetooth.device.action.PAIRING_CANCEL" /> <action android:name="android.bluetooth.device.action.PAIRING_CANCEL" />
<action android:name="android.bluetooth.device.action.BOND_STATE_CHANGED" />
</intent-filter> </intent-filter>
</receiver> </receiver>

13
src/com/android/settings/bluetooth/BluetoothPairingRequest.java
View File

@@ -103,6 +103,19 @@ public final class BluetoothPairingRequest extends BroadcastReceiver {
NotificationManager manager = (NotificationManager) context NotificationManager manager = (NotificationManager) context
.getSystemService(Context.NOTIFICATION_SERVICE); .getSystemService(Context.NOTIFICATION_SERVICE);
manager.cancel(NOTIFICATION_ID); 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);
}
} }
} }
} }