Cache all certs and installed packages when initialized. am: f10bfbce7f (246b000a) · Commits · e / os / android_frameworks_opt_telephony

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

+86 −31

Original line number	Original line	Diff line number	Diff line
	@@ -45,6 +45,7 @@ import android.os.Message;
	import android.os.PersistableBundle;		import android.os.PersistableBundle;
	import android.os.Registrant;		import android.os.Registrant;
	import android.os.RegistrantList;		import android.os.RegistrantList;
			import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
	import android.telephony.CarrierConfigManager;		import android.telephony.CarrierConfigManager;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	@@ -59,6 +60,7 @@ import android.util.Log;
	import com.android.internal.telephony.uicc.IccUtils;		import com.android.internal.telephony.uicc.IccUtils;

	import java.util.Arrays;		import java.util.Arrays;
			import java.util.Collections;
	import java.util.List;		import java.util.List;
	import java.util.Map;		import java.util.Map;
	import java.util.Set;		import java.util.Set;
	@@ -112,6 +114,11 @@ public class CarrierPrivilegesTracker extends Handler {
	*/		*/
	private static final int ACTION_PACKAGE_REMOVED = 6;		private static final int ACTION_PACKAGE_REMOVED = 6;

			/**
			* Action used to initialize the state of the Tracker.
			*/
			private static final int ACTION_INITIALIZE_TRACKER = 7;

	private final Context mContext;		private final Context mContext;
	private final Phone mPhone;		private final Phone mPhone;
	private final CarrierConfigManager mCarrierConfigManager;		private final CarrierConfigManager mCarrierConfigManager;
	@@ -212,6 +219,8 @@ public class CarrierPrivilegesTracker extends Handler {
	mInstalledPackageCerts = new ArrayMap<>();		mInstalledPackageCerts = new ArrayMap<>();
	mCachedUids = new ArrayMap<>();		mCachedUids = new ArrayMap<>();
	mPrivilegedUids = new int[0];		mPrivilegedUids = new int[0];

			sendMessage(obtainMessage(ACTION_INITIALIZE_TRACKER));
	}		}

	@Override		@Override
	@@ -243,6 +252,10 @@ public class CarrierPrivilegesTracker extends Handler {
	handlePackageRemoved(pkgName);		handlePackageRemoved(pkgName);
	break;		break;
	}		}
			case ACTION_INITIALIZE_TRACKER: {
			handleInitializeTracker();
			break;
			}
	default: {		default: {
	Log.e(TAG, "Received unknown msg type: " + msg.what);		Log.e(TAG, "Received unknown msg type: " + msg.what);
	break;		break;
	@@ -262,13 +275,24 @@ public class CarrierPrivilegesTracker extends Handler {
	private void handleCarrierConfigUpdated(int subId, int slotIndex) {		private void handleCarrierConfigUpdated(int subId, int slotIndex) {
	if (slotIndex != mPhone.getPhoneId()) return;		if (slotIndex != mPhone.getPhoneId()) return;

	Set<String> updatedCarrierConfigCerts = new ArraySet<>();		Set<String> updatedCarrierConfigCerts = Collections.EMPTY_SET;

	// Carrier Config broadcasts with INVALID_SUBSCRIPTION_ID when the SIM is removed. This is		// Carrier Config broadcasts with INVALID_SUBSCRIPTION_ID when the SIM is removed. This is
	// an expected event. When this happens, clear the certificates from the previous configs.		// an expected event. When this happens, clear the certificates from the previous configs.
	if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {		if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
			updatedCarrierConfigCerts = getCarrierConfigCerts(subId);
			}

			maybeUpdateCertsAndNotifyRegistrants(mCarrierConfigCerts, updatedCarrierConfigCerts);
			}

			private Set<String> getCarrierConfigCerts(int subId) {
	PersistableBundle carrierConfigs = mCarrierConfigManager.getConfigForSubId(subId);		PersistableBundle carrierConfigs = mCarrierConfigManager.getConfigForSubId(subId);
	if (mCarrierConfigManager.isConfigForIdentifiedCarrier(carrierConfigs)) {		if (!mCarrierConfigManager.isConfigForIdentifiedCarrier(carrierConfigs)) {
			return Collections.EMPTY_SET;
			}

			Set<String> updatedCarrierConfigCerts = new ArraySet<>();
	String[] carrierConfigCerts =		String[] carrierConfigCerts =
	carrierConfigs.getStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY);		carrierConfigs.getStringArray(KEY_CARRIER_CERTIFICATE_STRING_ARRAY);

	@@ -277,21 +301,28 @@ public class CarrierPrivilegesTracker extends Handler {
	updatedCarrierConfigCerts.add(cert.toUpperCase());		updatedCarrierConfigCerts.add(cert.toUpperCase());
	}		}
	}		}
	}		return updatedCarrierConfigCerts;
	}

	maybeUpdateCertsAndNotifyRegistrants(mCarrierConfigCerts, updatedCarrierConfigCerts);
	}		}

	private void handleSimStateChanged(int slotId, int simState) {		private void handleSimStateChanged(int slotId, int simState) {
	if (slotId != mPhone.getPhoneId()) return;		if (slotId != mPhone.getPhoneId()) return;

	Set<String> updatedUiccCerts = new ArraySet<>();		Set<String> updatedUiccCerts = Collections.EMPTY_SET;

	// Only include the UICC certs if the SIM is fully loaded		// Only include the UICC certs if the SIM is fully loaded
	if (simState == SIM_STATE_LOADED) {		if (simState == SIM_STATE_LOADED) {
			updatedUiccCerts = getSimCerts();
			}

			maybeUpdateCertsAndNotifyRegistrants(mUiccCerts, updatedUiccCerts);
			}

			private Set<String> getSimCerts() {
			Set<String> updatedUiccCerts = Collections.EMPTY_SET;
	TelephonyManager telMan = mTelephonyManager.createForSubscriptionId(mPhone.getSubId());		TelephonyManager telMan = mTelephonyManager.createForSubscriptionId(mPhone.getSubId());

	if (telMan.hasIccCard(mPhone.getPhoneId())) {		if (telMan.hasIccCard(mPhone.getPhoneId())) {
			updatedUiccCerts = new ArraySet<>();
	List<String> uiccCerts = telMan.getCertsFromCarrierPrivilegeAccessRules();		List<String> uiccCerts = telMan.getCertsFromCarrierPrivilegeAccessRules();
	if (uiccCerts != null) {		if (uiccCerts != null) {
	for (String cert : uiccCerts) {		for (String cert : uiccCerts) {
	@@ -299,9 +330,7 @@ public class CarrierPrivilegesTracker extends Handler {
	}		}
	}		}
	}		}
	}		return updatedUiccCerts;

	maybeUpdateCertsAndNotifyRegistrants(mUiccCerts, updatedUiccCerts);
	}		}

	private void handlePackageAddedOrReplaced(String pkgName) {		private void handlePackageAddedOrReplaced(String pkgName) {
	@@ -313,6 +342,18 @@ public class CarrierPrivilegesTracker extends Handler {
	return;		return;
	}		}

			updateCertsForPackage(pkg);
			try {
			mCachedUids.put(pkg.packageName, getUidsForPackage(pkg.packageName));
			} catch (NameNotFoundException exception) {
			// Didn't find package. Continue looking at other packages
			Log.e(TAG, "Unable to find uid for package: " + pkg.packageName);
			}

			maybeUpdatePrivilegedUidsAndNotifyRegistrants();
			}

			private void updateCertsForPackage(PackageInfo pkg) {
	Set<String> certs = new ArraySet<>();		Set<String> certs = new ArraySet<>();
	List<Signature> signatures = UiccAccessRule.getSignatures(pkg);		List<Signature> signatures = UiccAccessRule.getSignatures(pkg);
	for (Signature signature : signatures) {		for (Signature signature : signatures) {
	@@ -324,15 +365,6 @@ public class CarrierPrivilegesTracker extends Handler {
	}		}

	mInstalledPackageCerts.put(pkg.packageName, certs);		mInstalledPackageCerts.put(pkg.packageName, certs);

	try {
	mCachedUids.put(pkg.packageName, getUidsForPackage(pkg.packageName));
	} catch (NameNotFoundException exception) {
	// Didn't find package. Continue looking at other packages
	Log.e(TAG, "Unable to find uid for package: " + pkg.packageName);
	}

	maybeUpdatePrivilegedUidsAndNotifyRegistrants();
	}		}

	private void handlePackageRemoved(String pkgName) {		private void handlePackageRemoved(String pkgName) {
	@@ -345,6 +377,29 @@ public class CarrierPrivilegesTracker extends Handler {
	maybeUpdatePrivilegedUidsAndNotifyRegistrants();		maybeUpdatePrivilegedUidsAndNotifyRegistrants();
	}		}

			private void handleInitializeTracker() {
			// Cache CarrierConfig Certs
			mCarrierConfigCerts.addAll(getCarrierConfigCerts(mPhone.getSubId()));

			// Cache SIM certs
			mUiccCerts.addAll(getSimCerts());

			// Cache all installed packages and their certs
			int flags =
			PackageManager.MATCH_DISABLED_COMPONENTS
			\| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
			\| PackageManager.GET_SIGNING_CERTIFICATES;
			List<PackageInfo> installedPackages =
			mPackageManager.getInstalledPackagesAsUser(
			flags, UserHandle.SYSTEM.getIdentifier());
			for (PackageInfo pkg : installedPackages) {
			updateCertsForPackage(pkg);
			}

			// Okay because no registrants exist yet
			maybeUpdatePrivilegedUidsAndNotifyRegistrants();
			}

	private void maybeUpdateCertsAndNotifyRegistrants(		private void maybeUpdateCertsAndNotifyRegistrants(
	Set<String> currentCerts, Set<String> updatedCerts) {		Set<String> currentCerts, Set<String> updatedCerts) {
	if (!currentCerts.equals(updatedCerts)) {		if (!currentCerts.equals(updatedCerts)) {