diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-07-09 01:56:03 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 01:56:03 +0000 |
| commit | 9978aef72b4f11a10c3bd8fe03fcbe7f7b7a9c7e (patch) | |
| tree | 4686c3aca87a5a5b0e43203fc2c91b9cfd45c3b4 /packages/SettingsLib | |
| parent | 3e2b53ff6981b7ef857cb28c5b2ddb3bc71002b9 (diff) | |
| parent | fd1b57263cc07a3a77d2ee076726758bd1d97d36 (diff) | |
| download | frameworks_base-9978aef72b4f11a10c3bd8fe03fcbe7f7b7a9c7e.zip frameworks_base-9978aef72b4f11a10c3bd8fe03fcbe7f7b7a9c7e.tar.gz frameworks_base-9978aef72b4f11a10c3bd8fe03fcbe7f7b7a9c7e.tar.bz2 | |
am fd1b5726: am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
* commit 'fd1b57263cc07a3a77d2ee076726758bd1d97d36':
Add Null checks while processing pairing cancel intent
Diffstat (limited to 'packages/SettingsLib')
| -rwxr-xr-x | packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java | 4 |
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 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); + } } } |