am 9978aef7: am fd1b5726: am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev

* commit '9978aef72b4f11a10c3bd8fe03fcbe7f7b7a9c7e':
  Add Null checks while processing pairing cancel intent

1 files changed, 3 insertions, 1 deletions

diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
index bf92fda5e16b..4bcbea76f134 100755
--- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
+++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
@@ -355,7 +355,9 @@ public final class BluetoothEventManager {
                 return;
             }
             int errorMsg = R.string.bluetooth_pairing_error_message;
-            Utils.showError(context, cachedDevice.getName(), errorMsg);
+            if (context != null && cachedDevice != null) {
+                Utils.showError(context, cachedDevice.getName(), errorMsg);
+            }
         }
     }