commit 7216ed67f41ba6c3cf0693dc3c8fe0d3e3505254
author Thomas Nguyen <tnd@google.com> Tue Nov 29 16:45:31 2022 -0800
committer Thomas Nguyen <tnd@google.com> Tue Nov 29 16:45:34 2022 -0800
tree ca463f4b52cf267d2fa102066aa4fa637f6782b5
parent 8db6b818ef48481e7f9a376c92cf7d7e0d116927

Fix for NPE at isPremiumCapabilityAvailableForPurchase

Bug: 259405165
Test: atest android.telephony5.cts.TelephonyManagerReadNonDangerousPermissionTest#testPremiumCapabilities

Change-Id: I9f23d06e4fce0ae80e072f09a0d15aa31e05bead

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8cc004e..170d86d 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -11294,6 +11294,10 @@
         }
 
         Phone phone = getPhone(subId);
+        if (phone == null) {
+            loge("isPremiumCapabilityAvailableForPurchase: phone is null, subId=" + subId);
+            return false;
+        }
         final long identity = Binder.clearCallingIdentity();
         try {
             return SlicePurchaseController.getInstance(phone)