Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0223f9c5 authored by Matthew Xie's avatar Matthew Xie Committed by Gerrit Code Review
Browse files

Merge "Bluetooth: GAP: Cancel the pairing notification on bond state change"

parents 14136c7c 68926914

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,7 @@ 
            <intent-filter>

                <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.BOND_STATE_CHANGED" />

            </intent-filter>

        </receiver>

src/com/android/settings/bluetooth/BluetoothPairingRequest.java

+13 −0
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }

}