diff options
| author | Sanket Padawe <sanketpadawe@google.com> | 2015-07-09 01:31:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-09 01:31:23 +0000 |
| commit | af468addb672ef002dee64376bc06f2bf8c6c0f9 (patch) | |
| tree | ea5b854c3f314827c9f72ff1c747fa9003b923e6 /packages/SettingsLib | |
| parent | 1549adb4eaef28ef41ebd063df1e339de035e19d (diff) | |
| parent | 58295e71d293c131508d280f1373d94716348b2e (diff) | |
| download | frameworks_base-af468addb672ef002dee64376bc06f2bf8c6c0f9.zip frameworks_base-af468addb672ef002dee64376bc06f2bf8c6c0f9.tar.gz frameworks_base-af468addb672ef002dee64376bc06f2bf8c6c0f9.tar.bz2 | |
am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev
* commit '58295e71d293c131508d280f1373d94716348b2e':
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); + } } } |