Rebind to all approved services on pkg change (1459074f) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/notification/ManagedServices.java

+29 −0

Original line number	Diff line number	Diff line
		@@ -517,6 +517,30 @@ abstract public class ManagedServices {
		return false;
		}

		protected boolean isPackageAllowed(String pkg, int userId) {
		if (pkg == null) {
		return false;
		}
		ArrayMap<Boolean, ArraySet<String>> allowedByType =
		mApproved.getOrDefault(userId, new ArrayMap<>());
		for (int i = 0; i < allowedByType.size(); i++) {
		ArraySet<String> allowed = allowedByType.valueAt(i);
		for (String allowedEntry : allowed) {
		ComponentName component = ComponentName.unflattenFromString(allowedEntry);
		if (component != null) {
		if (pkg.equals(component.getPackageName())) {
		return true;
		}
		} else {
		if (pkg.equals(allowedEntry)) {
		return true;
		}
		}
		}
		}
		return false;
		}

		public void onPackagesChanged(boolean removingPackage, String[] pkgList, int[] uidList) {
		if (DEBUG) Slog.d(TAG, "onPackagesChanged removingPackage=" + removingPackage
		+ " pkgList=" + (pkgList == null ? null : Arrays.asList(pkgList))
		@@ -537,6 +561,11 @@ abstract public class ManagedServices {
		if (mEnabledServicesPackageNames.contains(pkgName)) {
		anyServicesInvolved = true;
		}
		for (int uid : uidList) {
		if (isPackageAllowed(pkgName, UserHandle.getUserId(uid))) {
		anyServicesInvolved = true;
		}
		}
		}

		if (anyServicesInvolved) {

services/tests/uiservicestests/src/com/android/server/notification/ManagedServicesTest.java

+87 −1

Original line number	Diff line number	Diff line
		@@ -473,6 +473,59 @@ public class ManagedServicesTest extends UiServiceTestCase {
		}
		}

		@Test
		public void testIsPackageAllowed() {
		for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
		ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles,
		mIpm, approvalLevel);
		writeExpectedValuesToSettings(approvalLevel);
		service.migrateToXml();

		verifyExpectedApprovedPackages(service);
		}
		}

		@Test
		public void testUpgradeAppBindsNewServices() throws Exception {
		// If the primary and secondary lists contain component names, only those components within
		// the package should be matched
		ManagedServices service = new TestManagedServices(getContext(), mLock, mUserProfiles,
		mIpm,
		ManagedServices.APPROVAL_BY_PACKAGE);

		List<String> packages = new ArrayList<>();
		packages.add("package");
		addExpectedServices(service, packages, 0);

		// only 2 components are approved per package
		mExpectedPrimaryComponentNames.clear();
		mExpectedPrimaryPackages.clear();
		mExpectedPrimaryComponentNames.put(0, "package/C1:package/C2");
		mExpectedSecondaryComponentNames.clear();
		mExpectedSecondaryPackages.clear();

		loadXml(service);

		// new component expected
		mExpectedPrimaryComponentNames.put(0, "package/C1:package/C2:package/C3");

		service.onPackagesChanged(false, new String[]{"package"}, new int[]{0});

		// verify the 3 components per package are enabled (bound)
		verifyExpectedBoundEntries(service, true);

		// verify the last component per package is not enabled/we don't try to bind to it
		for (String pkg : packages) {
		ComponentName unapprovedAdditionalComponent =
		ComponentName.unflattenFromString(pkg + "/C3");
		assertFalse(
		service.isComponentEnabledForCurrentProfiles(
		unapprovedAdditionalComponent));
		verify(mIpm, never()).getServiceInfo(
		eq(unapprovedAdditionalComponent), anyInt(), anyInt());
		}
		}

		@Test
		public void testSetPackageOrComponentEnabled() throws Exception {
		for (int approvalLevel : new int[] {APPROVAL_BY_COMPONENT, APPROVAL_BY_PACKAGE}) {
		@@ -774,6 +827,39 @@ public class ManagedServicesTest extends UiServiceTestCase {
		}
		}


		private void verifyExpectedApprovedPackages(ManagedServices service) {
		verifyExpectedApprovedPackages(service, true);
		verifyExpectedApprovedPackages(service, false);
		}

		private void verifyExpectedApprovedPackages(ManagedServices service, boolean primary) {
		ArrayMap<Integer, String> verifyMap = primary
		? mExpectedPrimary.get(service.mApprovalLevel)
		: mExpectedSecondary.get(service.mApprovalLevel);
		verifyExpectedApprovedPackages(service, verifyMap);
		}

		private void verifyExpectedApprovedPackages(ManagedServices service,
		ArrayMap<Integer, String> verifyMap) {
		for (int userId : verifyMap.keySet()) {
		for (String verifyValue : verifyMap.get(userId).split(":")) {
		if (!TextUtils.isEmpty(verifyValue)) {
		ComponentName component = ComponentName.unflattenFromString(verifyValue);
		if (component != null ) {
		assertTrue("service type " + service.mApprovalLevel + ":"
		+ verifyValue + " is not allowed for user " + userId,
		service.isPackageAllowed(component.getPackageName(), userId));
		} else {
		assertTrue("service type " + service.mApprovalLevel + ":"
		+ verifyValue + " is not allowed for user " + userId,
		service.isPackageAllowed(verifyValue, userId));
		}
		}
		}
		}
		}

		private void writeExpectedValuesToSettings(int approvalLevel) {
		for (int userId : mExpectedPrimary.get(approvalLevel).keySet()) {
		Settings.Secure.putStringForUser(getContext().getContentResolver(), SETTING,