commit 983dfe0b8b3a2c0a26257166f91e85c8008f4514
author Junda Liu <junda@google.com> Wed Mar 09 01:46:21 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 09 01:46:21 2016 +0000
tree 5d94e3991ef7cc823343f0288a9b525d6f06429b
parent 7877c7255268c34a71c7d1b4055afabb8fcba04c
parent 317d70be627c1816af361376943a6a258b4e13d5

Merge "Add null or empty string check to checkCarrierPrivilegesForPackage." into nyc-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index fc47d12..1963d34 100644
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -2369,6 +2369,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");
@@ -2379,6 +2381,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);