Fix NPE in handlePinMMI
Bug: 21902985
Change-Id: Ideca536a8d8e2093e6e95c6c52eae7322aea945b
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 25e25be..2d9b264 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -227,15 +227,18 @@
IccAPDUArgument iccArgument;
switch (msg.what) {
- case CMD_HANDLE_PIN_MMI:
+ case CMD_HANDLE_PIN_MMI: {
request = (MainThreadRequest) msg.obj;
- request.result = getPhoneFromRequest(request).handlePinMmi(
- (String) request.argument);
+ final Phone phone = getPhoneFromRequest(request);
+ request.result = phone != null ?
+ getPhoneFromRequest(request).handlePinMmi((String) request.argument)
+ : false;
// Wake up the requesting thread
synchronized (request) {
request.notifyAll();
}
break;
+ }
case CMD_HANDLE_NEIGHBORING_CELL:
request = (MainThreadRequest) msg.obj;