commit ed7662f6f6ff1e00ba46a67058cadca3eeeed825
author Treehugger Robot <treehugger-gerrit@google.com> Tue Jul 28 18:51:00 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 28 18:51:00 2020 +0000
tree 1fa02e58c7e10accbfd674609cbdd1b00dc96a28
parent 4be2b5c2f672045c9730980f3ba971ed31edd66f
parent fc7b6693eea970153468ee1a436d6538a780cac4

Merge "BluetoothPairingRequest: Add null check for action"

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

diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 7da6342..3cd21f5 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -34,7 +34,7 @@
   @Override
   public void onReceive(Context context, Intent intent) {
     String action = intent.getAction();
-    if (!action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
+    if (action == null || !action.equals(BluetoothDevice.ACTION_PAIRING_REQUEST)) {
       return;
     }
     // convert broadcast intent into activity intent (same action string)