commit 0f53225746e208f69a3fd6dd6021ee9be2acf1a8
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Dec 07 19:13:46 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Dec 07 19:13:46 2022 +0000
tree 144adb07104bd971e3f3aaa5527f713efbf00703
parent 76a2528215e4c418fbac0419ff1461b5d0d8c897
parent 19694118228e9bbb3e6f689f7b34819817887a7e

Merge "Purchase premium capability handle null phone"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 40049fc..493a85f 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -11395,6 +11395,21 @@
         }
 
         Phone phone = getPhone(subId);
+        if (phone == null) {
+            try {
+                int result = TelephonyManager.PURCHASE_PREMIUM_CAPABILITY_RESULT_REQUEST_FAILED;
+                callback.accept(result);
+                loge("purchasePremiumCapability: phone is null, subId=" + subId);
+            } catch (RemoteException e) {
+                String logStr = "Purchase premium capability "
+                        + TelephonyManager.convertPremiumCapabilityToString(capability)
+                        + " failed due to RemoteException handling null phone: " + e;
+                if (DBG) log(logStr);
+                AnomalyReporter.reportAnomaly(
+                        UUID.fromString(PURCHASE_PREMIUM_CAPABILITY_ERROR_UUID), logStr);
+            }
+            return;
+        }
         String appName;
         try {
             appName = mApp.getPackageManager().getApplicationLabel(mApp.getPackageManager()