commit 110676e5cef6843e14310016a2844fb72858f3cd
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Sat Dec 07 04:15:28 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Dec 07 04:15:28 2024 +0000
tree 25e69b6fb6faff9632f537bf1a96187465e6b18a
parent 97a6bf27e370270b190e17f31e9d2944acd500ca
parent 58e46cad1c635a0b6fd061810c206905ce37e506

Merge "Fix minor Telephony crashes" into main

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7ad35ed..7cba4fc 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -9168,10 +9168,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 {
@@ -9199,7 +9201,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 {