diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-07-09 01:42:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 01:42:19 +0000 |
| commit | fd1b57263cc07a3a77d2ee076726758bd1d97d36 (patch) | |
| tree | c0e152f3f3b70fbc675e3be41f836f5050b00460 /packages/SettingsLib/src/com/android/settingslib | |
| parent | 1ad61b3314b1ea3a99d804ec9a89caae25636897 (diff) | |
| parent | af468addb672ef002dee64376bc06f2bf8c6c0f9 (diff) | |
| download | frameworks_base-fd1b57263cc07a3a77d2ee076726758bd1d97d36.zip frameworks_base-fd1b57263cc07a3a77d2ee076726758bd1d97d36.tar.gz frameworks_base-fd1b57263cc07a3a77d2ee076726758bd1d97d36.tar.bz2 | |
am af468add: am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
* commit 'af468addb672ef002dee64376bc06f2bf8c6c0f9':
Add Null checks while processing pairing cancel intent
Diffstat (limited to 'packages/SettingsLib/src/com/android/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); + } } } |