Move carrier privilege status checks to CarrierPrivilegesTracker. (9c6e2ac2) · Commits · e / os / android_frameworks_opt_telephony

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

+58 −3

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ import static android.telephony.TelephonyManager.SIM_STATE_UNKNOWN;

	import android.annotation.NonNull;		import android.annotation.NonNull;
	import android.annotation.Nullable;		import android.annotation.Nullable;
			import android.app.ActivityManager;
	import android.content.BroadcastReceiver;		import android.content.BroadcastReceiver;
	import android.content.Context;		import android.content.Context;
	import android.content.Intent;		import android.content.Intent;
	@@ -48,6 +49,7 @@ import android.os.Registrant;
	import android.os.RegistrantList;		import android.os.RegistrantList;
	import android.os.UserHandle;		import android.os.UserHandle;
	import android.os.UserManager;		import android.os.UserManager;
			import android.telephony.Annotation.CarrierPrivilegeStatus;
	import android.telephony.CarrierConfigManager;		import android.telephony.CarrierConfigManager;
	import android.telephony.SubscriptionManager;		import android.telephony.SubscriptionManager;
	import android.telephony.TelephonyManager;		import android.telephony.TelephonyManager;
	@@ -63,6 +65,7 @@ import com.android.internal.annotations.GuardedBy;
	import com.android.internal.telephony.uicc.IccUtils;		import com.android.internal.telephony.uicc.IccUtils;
	import com.android.internal.telephony.uicc.UiccPort;		import com.android.internal.telephony.uicc.UiccPort;
	import com.android.internal.telephony.uicc.UiccProfile;		import com.android.internal.telephony.uicc.UiccProfile;
			import com.android.internal.util.ArrayUtils;
	import com.android.telephony.Rlog;		import com.android.telephony.Rlog;

	import java.io.FileDescriptor;		import java.io.FileDescriptor;
	@@ -514,10 +517,13 @@ public class CarrierPrivilegesTracker extends Handler {
	}		}

	private void refreshInstalledPackageCache() {		private void refreshInstalledPackageCache() {
			// Include DISABLED_UNTIL_USED components. This facilitates cases where a carrier app
			// is disabled by default, and some other component wants to enable it when it has
			// gained carrier privileges (as an indication that a matching SIM has been inserted).
	int flags =		int flags =
	PackageManager.MATCH_DISABLED_COMPONENTS		PackageManager.GET_SIGNING_CERTIFICATES
	\| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS		\| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
	\| PackageManager.GET_SIGNING_CERTIFICATES;		\| PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS;
	List<PackageInfo> installedPackages =		List<PackageInfo> installedPackages =
	mPackageManager.getInstalledPackagesAsUser(		mPackageManager.getInstalledPackagesAsUser(
	flags, UserHandle.SYSTEM.getIdentifier());		flags, UserHandle.SYSTEM.getIdentifier());
	@@ -581,6 +587,11 @@ public class CarrierPrivilegesTracker extends Handler {
	} finally {		} finally {
	mPrivilegedPackageInfoLock.readLock().unlock();		mPrivilegedPackageInfoLock.readLock().unlock();
	}		}

			// Update set of enabled carrier apps now that the privilege rules may have changed.
			ActivityManager am = mContext.getSystemService(ActivityManager.class);
			CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),
			mTelephonyManager, am.getCurrentUser(), mContext);
	}		}

	private PrivilegedPackageInfo getCurrentPrivilegedPackagesForAllUsers() {		private PrivilegedPackageInfo getCurrentPrivilegedPackagesForAllUsers() {
	@@ -730,7 +741,51 @@ public class CarrierPrivilegesTracker extends Handler {
	// best effort.		// best effort.
	refreshInstalledPackageCache();		refreshInstalledPackageCache();
	}		}

	maybeUpdatePrivilegedPackagesAndNotifyRegistrants();		maybeUpdatePrivilegedPackagesAndNotifyRegistrants();
	}		}

			/** Backing of {@link TelephonyManager#checkCarrierPrivilegesForPackage}. */
			public @CarrierPrivilegeStatus int getCarrierPrivilegeStatusForPackage(String packageName) {
			// TODO(b/205736323) consider if/how we want to account for the RULES_NOT_LOADED and
			// ERROR_LOADING_RULES constants. Technically those will never be returned today since those
			// results are only from the SIM rules, but the CC rules' result (which never has these
			// errors) always supersede them unless something goes super wrong when getting CC.
			mPrivilegedPackageInfoLock.readLock().lock();
			try {
			return mPrivilegedPackageInfo.mPackageNames.contains(packageName)
			? TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS
			: TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
			} finally {
			mPrivilegedPackageInfoLock.readLock().unlock();
			}
			}

			/** Backing of {@link TelephonyManager#getPackagesWithCarrierPrivileges}. */
			public Set<String> getPackagesWithCarrierPrivileges() {
			mPrivilegedPackageInfoLock.readLock().lock();
			try {
			return Collections.unmodifiableSet(mPrivilegedPackageInfo.mPackageNames);
			} finally {
			mPrivilegedPackageInfoLock.readLock().unlock();
			}
			}

			/**
			* Backing of {@link TelephonyManager#hasCarrierPrivileges} and {@link
			* TelephonyManager#getCarrierPrivilegeStatus(int)}.
			*/
			public @CarrierPrivilegeStatus int getCarrierPrivilegeStatusForUid(int uid) {
			// TODO(b/205736323) consider if/how we want to account for the RULES_NOT_LOADED and
			// ERROR_LOADING_RULES constants. Technically those will never be returned today since those
			// results are only from the SIM rules, but the CC rules' result (which never has these
			// errors) always supersede them unless something goes super wrong when getting CC.
			mPrivilegedPackageInfoLock.readLock().lock();
			try {
			return ArrayUtils.contains(mPrivilegedPackageInfo.mUids, uid)
			? TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS
			: TelephonyManager.CARRIER_PRIVILEGE_STATUS_NO_ACCESS;
			} finally {
			mPrivilegedPackageInfoLock.readLock().unlock();
			}
			}
	}		}

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

+18 −6

Original line number	Original line	Diff line number	Diff line
	@@ -378,8 +378,11 @@ public class UiccPort {

	/**		/**
	* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatus}.		* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatus}.
	* @deprecated Please use		*
	* {@link UiccProfile#getCarrierPrivilegeStatus(Signature, String)} instead.		* <p>TODO(b/205736323) remove this and downstream once fully moved to CarrierPrivilegesTracker
			*
			* @deprecated Please use {@link UiccProfile#getCarrierPrivilegeStatus(Signature, String)}
			* instead.
	*/		*/
	@Deprecated		@Deprecated
	public int getCarrierPrivilegeStatus(Signature signature, String packageName) {		public int getCarrierPrivilegeStatus(Signature signature, String packageName) {
	@@ -392,8 +395,11 @@ public class UiccPort {

	/**		/**
	* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatus}.		* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatus}.
	* @deprecated Please use		*
	* {@link UiccProfile#getCarrierPrivilegeStatus(PackageManager, String)} instead.		* <p>TODO(b/205736323) remove this and downstream once fully moved to CarrierPrivilegesTracker
			*
			* @deprecated Please use {@link UiccProfile#getCarrierPrivilegeStatus(PackageManager, String)}
			* instead.
	*/		*/
	@Deprecated		@Deprecated
	public int getCarrierPrivilegeStatus(PackageManager packageManager, String packageName) {		public int getCarrierPrivilegeStatus(PackageManager packageManager, String packageName) {
	@@ -406,6 +412,9 @@ public class UiccPort {

	/**		/**
	* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatus}.		* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatus}.
			*
			* <p>TODO(b/205736323) remove this and downstream once fully moved to CarrierPrivilegesTracker
			*
	* @deprecated Please use {@link UiccProfile#getCarrierPrivilegeStatus(PackageInfo)} instead.		* @deprecated Please use {@link UiccProfile#getCarrierPrivilegeStatus(PackageInfo)} instead.
	*/		*/
	@Deprecated		@Deprecated
	@@ -419,8 +428,11 @@ public class UiccPort {

	/**		/**
	* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatusForCurrentTransaction}.		* Exposes {@link UiccCarrierPrivilegeRules#getCarrierPrivilegeStatusForCurrentTransaction}.
	* @deprecated Please use		*
	* {@link UiccProfile#getCarrierPrivilegeStatusForCurrentTransaction(PackageManager)} instead.		* <p>TODO(b/205736323) remove this and downstream once fully moved to CarrierPrivilegesTracker
			*
			* @deprecated Please use {@link
			* UiccProfile#getCarrierPrivilegeStatusForCurrentTransaction(PackageManager)} instead.
	*/		*/
	@Deprecated		@Deprecated
	public int getCarrierPrivilegeStatusForCurrentTransaction(PackageManager packageManager) {		public int getCarrierPrivilegeStatusForCurrentTransaction(PackageManager packageManager) {

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

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1334,6 +1334,7 @@ public class UiccProfile extends IccCard {
	}		}

	private void onCarrierPrivilegesLoadedMessage() {		private void onCarrierPrivilegesLoadedMessage() {
			// TODO(b/211796398): clean up logic below once all carrier privilege check migration done
	// Update set of enabled carrier apps now that the privilege rules may have changed.		// Update set of enabled carrier apps now that the privilege rules may have changed.
	ActivityManager am = mContext.getSystemService(ActivityManager.class);		ActivityManager am = mContext.getSystemService(ActivityManager.class);
	CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),		CarrierAppUtils.disableCarrierAppsUntilPrivileged(mContext.getOpPackageName(),

tests/telephonytests/src/com/android/internal/telephony/CarrierPrivilegesTrackerTest.java

+46 −3

Original line number	Original line	Diff line number	Diff line
	@@ -105,9 +105,9 @@ public class CarrierPrivilegesTrackerTest extends TelephonyTest {
	private static final int[] PRIVILEGED_UIDS = {UID_1, UID_2};		private static final int[] PRIVILEGED_UIDS = {UID_1, UID_2};

	private static final int PM_FLAGS =		private static final int PM_FLAGS =
	PackageManager.MATCH_DISABLED_COMPONENTS		PackageManager.GET_SIGNING_CERTIFICATES
	\| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS		\| PackageManager.MATCH_DISABLED_UNTIL_USED_COMPONENTS
	\| PackageManager.GET_SIGNING_CERTIFICATES;		\| PackageManager.MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS;

	@Mock private Signature mSignature;		@Mock private Signature mSignature;

	@@ -257,6 +257,21 @@ public class CarrierPrivilegesTrackerTest extends TelephonyTest {
	}		}
	}		}

			private void verifyCurrentState(Set<String> expectedPackageNames, int[] expectedUids) {
			assertEquals(
			expectedPackageNames, mCarrierPrivilegesTracker.getPackagesWithCarrierPrivileges());
			for (String packageName : expectedPackageNames) {
			assertEquals(
			TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS,
			mCarrierPrivilegesTracker.getCarrierPrivilegeStatusForPackage(packageName));
			}
			for (int uid : expectedUids) {
			assertEquals(
			TelephonyManager.CARRIER_PRIVILEGE_STATUS_HAS_ACCESS,
			mCarrierPrivilegesTracker.getCarrierPrivilegeStatusForUid(uid));
			}
			}

	private void verifyRegistrantUpdates(@Nullable int[] expectedUids, int expectedUidUpdates) {		private void verifyRegistrantUpdates(@Nullable int[] expectedUids, int expectedUidUpdates) {
	assertArrayEquals(expectedUids, mHandler.privilegedUids);		assertArrayEquals(expectedUids, mHandler.privilegedUids);
	assertEquals(expectedUidUpdates, mHandler.numUidUpdates);		assertEquals(expectedUidUpdates, mHandler.numUidUpdates);
	@@ -291,8 +306,9 @@ public class CarrierPrivilegesTrackerTest extends TelephonyTest {
	mHandler, REGISTRANT_WHAT, null);		mHandler, REGISTRANT_WHAT, null);
	mTestableLooper.processAllMessages();		mTestableLooper.processAllMessages();

			// No updates triggered, but the registrant gets an empty update.
			verifyCurrentState(Set.of(), new int[0]);
	verifyRegistrantUpdates(new int[0] /* expectedUids /, 1 / expectedUidUpdates */);		verifyRegistrantUpdates(new int[0] /* expectedUids /, 1 / expectedUidUpdates */);
	// No updates triggered, so TelephonyRegistry doesn't get any updates.