Fix minor Telephony crashes
These popped up when testing disabled CDMA calls. Probably not related,
but fixing them just to be on the safe side.
Bug: 379356026
Test: m
Flag: EXEMPT bugfix
Change-Id: I8f9f86c66864b3fe4d1200c560283fc71573898e
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 1a645da..36ed19d 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9166,10 +9166,12 @@
}
String aid = null;
try {
- aid = UiccController.getInstance().getUiccPort(phone.getPhoneId())
- .getApplicationByType(appType).getAid();
+ UiccCardApplication app = UiccController.getInstance()
+ .getUiccPort(phone.getPhoneId()).getApplicationByType(appType);
+ if (app == null) return null;
+ aid = app.getAid();
} catch (Exception e) {
- Log.e(LOG_TAG, "Not getting aid. Exception ex=" + e);
+ Log.e(LOG_TAG, "Not getting aid", e);
}
return aid;
} finally {
@@ -9197,7 +9199,7 @@
try {
esn = phone.getEsn();
} catch (Exception e) {
- Log.e(LOG_TAG, "Not getting ESN. Exception ex=" + e);
+ Log.e(LOG_TAG, "Not getting ESN", e);
}
return esn;
} finally {