Merge "CPT: build carrier privileges cache when AccessRules are loaded" into tm-dev (19191387) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/CarrierPrivilegesTracker.java

+36 −16

Original line number	Diff line number	Diff line
		@@ -181,6 +181,11 @@ public class CarrierPrivilegesTracker extends Handler {
		*/
		private static final int ACTION_CLEAR_UICC_RULES = 9;

		/**
		* Action to handle the case when UiccAccessRules has been loaded.
		*/
		private static final int ACTION_UICC_ACCESS_RULES_LOADED = 10;

		private final Context mContext;
		private final Phone mPhone;
		private final PackageManager mPackageManager;
		@@ -433,6 +438,9 @@ public class CarrierPrivilegesTracker extends Handler {
		handleClearUiccRules();
		break;
		}
		case ACTION_UICC_ACCESS_RULES_LOADED: {
		handleUiccAccessRulesLoaded();
		}
		default: {
		Rlog.e(TAG, "Received unknown msg type: " + msg.what);
		break;
		@@ -505,16 +513,8 @@ public class CarrierPrivilegesTracker extends Handler {

		// Only include the UICC rules if the SIM is fully loaded
		if (simState == SIM_STATE_LOADED) {
		mClearUiccRulesUptimeMillis = CLEAR_UICC_RULE_NOT_SCHEDULED;
		removeMessages(ACTION_CLEAR_UICC_RULES);

		updatedUiccRules = getSimRules();

		mLocalLog.log("SIM fully loaded:"
		+ " slotId=" + slotId
		+ " simState=" + simState
		+ " updated SIM-loaded rules=" + updatedUiccRules);
		maybeUpdateRulesAndNotifyRegistrants(mUiccRules, updatedUiccRules);
		mLocalLog.log("SIM fully loaded, handleUiccAccessRulesLoaded.");
		handleUiccAccessRulesLoaded();
		} else {
		if (!mUiccRules.isEmpty()
		&& mClearUiccRulesUptimeMillis == CLEAR_UICC_RULE_NOT_SCHEDULED) {
		@@ -522,8 +522,9 @@ public class CarrierPrivilegesTracker extends Handler {
		SystemClock.uptimeMillis() + CLEAR_UICC_RULES_DELAY_MILLIS;
		sendMessageAtTime(obtainMessage(ACTION_CLEAR_UICC_RULES),
		mClearUiccRulesUptimeMillis);
		mLocalLog.log("SIM is gone. Delay " + TimeUnit.MILLISECONDS.toSeconds(
		CLEAR_UICC_RULES_DELAY_MILLIS) + " seconds to clear UICC rules.");
		mLocalLog.log("SIM is gone, simState=" + simState + ". Delay "
		+ TimeUnit.MILLISECONDS.toSeconds(CLEAR_UICC_RULES_DELAY_MILLIS)
		+ " seconds to clear UICC rules.");
		} else {
		mLocalLog.log(
		"Ignore SIM gone event while UiccRules is empty or waiting to be emptied.");
		@@ -531,6 +532,21 @@ public class CarrierPrivilegesTracker extends Handler {
		}
		}

		private void handleUiccAccessRulesLoaded() {
		mClearUiccRulesUptimeMillis = CLEAR_UICC_RULE_NOT_SCHEDULED;
		removeMessages(ACTION_CLEAR_UICC_RULES);

		List<UiccAccessRule> updatedUiccRules = getSimRules();
		mLocalLog.log("UiccAccessRules loaded:"
		+ " updated SIM-loaded rules=" + updatedUiccRules);
		maybeUpdateRulesAndNotifyRegistrants(mUiccRules, updatedUiccRules);
		}

		/** Called when UiccAccessRules has been loaded */
		public void onUiccAccessRulesLoaded() {
		sendEmptyMessage(ACTION_UICC_ACCESS_RULES_LOADED);
		}

		private void handleClearUiccRules() {
		mClearUiccRulesUptimeMillis = CLEAR_UICC_RULE_NOT_SCHEDULED;
		removeMessages(ACTION_CLEAR_UICC_RULES);
		@@ -577,9 +593,11 @@ public class CarrierPrivilegesTracker extends Handler {
		// installed for a user it wasn't installed in before, which means there will be an
		// additional UID.
		getUidsForPackage(pkg.packageName, /* invalidateCache= */ true);
		mLocalLog.log("Package added/replaced/changed:"
		if (VDBG) {
		Rlog.d(TAG, "Package added/replaced/changed:"
		+ " pkg=" + Rlog.pii(TAG, pkgName)
		+ " cert hashes=" + mInstalledPackageCerts.get(pkgName));
		}

		maybeUpdatePrivilegedPackagesAndNotifyRegistrants();
		}
		@@ -606,7 +624,9 @@ public class CarrierPrivilegesTracker extends Handler {
		return;
		}

		mLocalLog.log("Package removed or disabled by user: pkg=" + Rlog.pii(TAG, pkgName));
		if (VDBG) {
		Rlog.d(TAG, "Package removed or disabled by user: pkg=" + Rlog.pii(TAG, pkgName));
		}

		maybeUpdatePrivilegedPackagesAndNotifyRegistrants();
		}

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ import android.util.ArraySet;

		import com.android.internal.annotations.VisibleForTesting;
		import com.android.internal.telephony.CarrierAppUtils;
		import com.android.internal.telephony.CarrierPrivilegesTracker;
		import com.android.internal.telephony.CommandsInterface;
		import com.android.internal.telephony.IccCard;
		import com.android.internal.telephony.IccCardConstants;
		@@ -238,6 +239,13 @@ public class UiccProfile extends IccCard {

		case EVENT_CARRIER_PRIVILEGES_LOADED:
		if (VDBG) log("handleMessage: EVENT_CARRIER_PRIVILEGES_LOADED");
		Phone phone = PhoneFactory.getPhone(mPhoneId);
		if (phone != null) {
		CarrierPrivilegesTracker cpt = phone.getCarrierPrivilegesTracker();
		if (cpt != null) {
		cpt.onUiccAccessRulesLoaded();
		}
		}
		onCarrierPrivilegesLoadedMessage();
		updateExternalState();
		break;