commit 50ecba360335a12252c30c95c309ef3ff5560fbf
author Zach Johnson <zachoverflow@google.com> Tue May 19 00:24:21 2015 -0700
committer Zach Johnson <zachoverflow@google.com> Mon Jun 08 13:52:25 2015 -0700
tree 770f5ab1e9061b73eb0074f5267cb63b8db87d1d
parent 7251668b521d6c0782a688090d930a52bb0ab3d0

Implement checkCarrierPrivilegesForPackageAnyPhone

Checks if the provided package has carrier privileges
for any active phone.

Change-Id: I3d521142d4891a03cd3b0b0cf788ce30722d35fd

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 9628b92..500e173 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2042,13 +2042,33 @@
     }
 
     @Override
-    public int checkCarrierPrivilegesForPackage(String pkgname) {
+    public int checkCarrierPrivilegesForPackage(String pkgName) {
         UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
         if (card == null) {
             loge("checkCarrierPrivilegesForPackage: No UICC");
             return TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
         }
-        return card.getCarrierPrivilegeStatus(mPhone.getContext().getPackageManager(), pkgname);
+        return card.getCarrierPrivilegeStatus(mPhone.getContext().getPackageManager(), pkgName);
+    }
+
+    @Override
+    public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
+        int result = TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
+        for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
+            UiccCard card = UiccController.getInstance().getUiccCard(i);
+            if (card == null) {
+              loge("checkCarrierPrivilegesForPackageAnyPhones: No UICC");
+              continue;
+            }
+
+            result = card.getCarrierPrivilegeStatus(
+                mPhone.getContext().getPackageManager(), pkgName);
+            if (result == TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS) {
+                break;
+            }
+        }
+
+        return result;
     }
 
     @Override