From 4d08a485db5021638b0abcb8675ba00579bd7fcc Mon Sep 17 00:00:00 2001 From: Sanket Padawe Date: Tue, 7 Jul 2015 14:12:15 -0700 Subject: Add Null checks while processing pairing cancel intent Use case: Exception while handling pairing cancel Intent received 1. Initiate pairing from DUT to remote 2. Power off DUT after getting pairing popup Root Cause:Crash observed in settings application Change-Id: Ia05fe196ecf6a1d4ec26f85b0cf984e23089c728 Fix: Fixed by adding Null check in PairingCancelHandler --- .../src/com/android/settingslib/bluetooth/BluetoothEventManager.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'packages/SettingsLib/src') diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java index bf92fda..4bcbea7 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); + } } } -- cgit v1.1