am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev

* commit '58295e71d293c131508d280f1373d94716348b2e':
  Add Null checks while processing pairing cancel intent
This commit is contained in:
Sanket Padawe
2015-07-09 01:31:23 +00:00
committed by Android Git Automerger

View File

@@ -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);
}
}
}