commit 317d70be627c1816af361376943a6a258b4e13d5
author Junda Liu <junda@google.com> Tue Mar 08 09:33:53 2016 -0800
committer Junda Liu <junda@google.com> Tue Mar 08 10:12:00 2016 -0800
tree f262eab6c8ca097fff0ec11561cb0de03ed387ad
parent 4ca92dd4a59ceccffbc48898f50cdfeb7f6c47a0

Add null or empty string check to checkCarrierPrivilegesForPackage.

Bug: b/27392085

Change-Id: I68b2001611960e44649c0b89abbf92fdb944eae1

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 8e19379..0539d78 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2368,6 +2368,8 @@
 
     @Override
     public int checkCarrierPrivilegesForPackage(String pkgName) {
+        if (TextUtils.isEmpty(pkgName))
+            return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
         UiccCard card = UiccController.getInstance().getUiccCard(mPhone.getPhoneId());
         if (card == null) {
             loge("checkCarrierPrivilegesForPackage: No UICC");
@@ -2378,6 +2380,8 @@
 
     @Override
     public int checkCarrierPrivilegesForPackageAnyPhone(String pkgName) {
+        if (TextUtils.isEmpty(pkgName))
+            return TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
         int result = TelephonyManager.CARRIER_PRIVILEGE_STATUS_RULES_NOT_LOADED;
         for (int i = 0; i < TelephonyManager.getDefault().getPhoneCount(); i++) {
             UiccCard card = UiccController.getInstance().getUiccCard(i);