Merge "add null pointer check for CarrierPrivilegeRules" (14364026) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/uicc/UiccProfile.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -286,6 +286,8 @@ public class UiccProfile extends IccCard {
		mCatService = null;
		mUiccApplications = null;
		mCarrierPrivilegeRules = null;
		mContext.getContentResolver().unregisterContentObserver(
		mProvisionCompleteContentObserver);
		mDisposed = true;
		}
		}
		@@ -964,6 +966,8 @@ public class UiccProfile extends IccCard {
		} else if (mCarrierPrivilegeRules != null
		&& ics.mCardState != CardState.CARDSTATE_PRESENT) {
		mCarrierPrivilegeRules = null;
		mContext.getContentResolver().unregisterContentObserver(
		mProvisionCompleteContentObserver);
		}

		sanitizeApplicationIndexesLocked();
		@@ -1214,7 +1218,9 @@ public class UiccProfile extends IccCard {
		if (certPackageMap.isEmpty()) {
		return Collections.emptySet();
		}

		if (mCarrierPrivilegeRules == null) {
		return Collections.emptySet();
		}
		Set<String> uninstalledCarrierPackages = new ArraySet<>();
		List<UiccAccessRule> accessRules = mCarrierPrivilegeRules.getAccessRules();
		for (UiccAccessRule accessRule : accessRules) {
		@@ -1368,6 +1374,8 @@ public class UiccProfile extends IccCard {
		if (reset && TextUtils.isEmpty(aid)) {
		if (mCarrierPrivilegeRules != null) {
		mCarrierPrivilegeRules = null;
		mContext.getContentResolver().unregisterContentObserver(
		mProvisionCompleteContentObserver);
		changed = true;
		}
		// CatService shall be disposed only when a card level reset happens.