Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add Null checks while processing pairing cancel intent" into mnc-dev

Browse Source
This commit is contained in:
Sanket Padawe
2015-07-09 01:16:01 +00:00
committed by Android (Google) Code Review
parent 7fb1655a89 4d08a485db
commit 58295e71d2
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothEventManager.java
View File

@@ -355,9 +355,11 @@ public final class BluetoothEventManager {
return; return;
} }
int errorMsg = R.string.bluetooth_pairing_error_message; int errorMsg = R.string.bluetooth_pairing_error_message;
if (context != null && cachedDevice != null) {
Utils.showError(context, cachedDevice.getName(), errorMsg); Utils.showError(context, cachedDevice.getName(), errorMsg);
} }
} }
}
private class DockEventHandler implements Handler { private class DockEventHandler implements Handler {
public void onReceive(Context context, Intent intent, BluetoothDevice device) { public void onReceive(Context context, Intent intent, BluetoothDevice device) {