Merge cherrypicks of [20404106, 20406267] into security-aosp-qt-release. (b02406e6) · Commits · e / os / android_frameworks_base

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

+1 −10

Original line number	Original line	Diff line number	Diff line
	@@ -3610,16 +3610,7 @@ public class NotificationManagerService extends SystemService {
	}		}
	enforcePolicyAccess(Binder.getCallingUid(), "addAutomaticZenRule");		enforcePolicyAccess(Binder.getCallingUid(), "addAutomaticZenRule");

	// If the caller is system, take the package name from the rule's owner rather than		return mZenModeHelper.addAutomaticZenRule(pkg, automaticZenRule,
	// from the caller's package.
	String rulePkg = pkg;
	if (isCallingUidSystem()) {
	if (automaticZenRule.getOwner() != null) {
	rulePkg = automaticZenRule.getOwner().getPackageName();
	}
	}

	return mZenModeHelper.addAutomaticZenRule(rulePkg, automaticZenRule,
	"addAutomaticZenRule");		"addAutomaticZenRule");
	}		}

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

+6 −1

Original line number	Original line	Diff line number	Diff line
	@@ -291,7 +291,7 @@ public class ZenModeHelper {

	public String addAutomaticZenRule(String pkg, AutomaticZenRule automaticZenRule,		public String addAutomaticZenRule(String pkg, AutomaticZenRule automaticZenRule,
	String reason) {		String reason) {
	if (!ZenModeConfig.SYSTEM_AUTHORITY.equals(pkg)) {		if (!isSystemRule(automaticZenRule)) {
	PackageItemInfo component = getServiceInfo(automaticZenRule.getOwner());		PackageItemInfo component = getServiceInfo(automaticZenRule.getOwner());
	if (component == null) {		if (component == null) {
	component = getActivityInfo(automaticZenRule.getConfigurationActivity());		component = getActivityInfo(automaticZenRule.getConfigurationActivity());
	@@ -532,6 +532,11 @@ public class ZenModeHelper {
	}		}
	}		}

			private boolean isSystemRule(AutomaticZenRule rule) {
			return rule.getOwner() != null
			&& ZenModeConfig.SYSTEM_AUTHORITY.equals(rule.getOwner().getPackageName());
			}

	private ServiceInfo getServiceInfo(ComponentName owner) {		private ServiceInfo getServiceInfo(ComponentName owner) {
	Intent queryIntent = new Intent();		Intent queryIntent = new Intent();
	queryIntent.setComponent(owner);		queryIntent.setComponent(owner);

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

+0 −37

Original line number	Original line	Diff line number	Diff line
	@@ -5120,43 +5120,6 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {
	mBinderService.addAutomaticZenRule(rule, mContext.getPackageName());		mBinderService.addAutomaticZenRule(rule, mContext.getPackageName());
	}		}

	@Test
	public void testAddAutomaticZenRule_systemCallTakesPackageFromOwner() throws Exception {
	mService.isSystemUid = true;
	ZenModeHelper mockZenModeHelper = mock(ZenModeHelper.class);
	when(mConditionProviders.isPackageOrComponentAllowed(anyString(), anyInt()))
	.thenReturn(true);
	mService.setZenHelper(mockZenModeHelper);
	ComponentName owner = new ComponentName("android", "ProviderName");
	ZenPolicy zenPolicy = new ZenPolicy.Builder().allowAlarms(true).build();
	boolean isEnabled = true;
	AutomaticZenRule rule = new AutomaticZenRule("test", owner, owner, mock(Uri.class),
	zenPolicy, NotificationManager.INTERRUPTION_FILTER_PRIORITY, isEnabled);
	mBinderService.addAutomaticZenRule(rule, "com.android.settings");

	// verify that zen mode helper gets passed in a package name of "android"
	verify(mockZenModeHelper).addAutomaticZenRule(eq("android"), eq(rule), anyString());
	}

	@Test
	public void testAddAutomaticZenRule_nonSystemCallTakesPackageFromArg() throws Exception {
	mService.isSystemUid = false;
	ZenModeHelper mockZenModeHelper = mock(ZenModeHelper.class);
	when(mConditionProviders.isPackageOrComponentAllowed(anyString(), anyInt()))
	.thenReturn(true);
	mService.setZenHelper(mockZenModeHelper);
	ComponentName owner = new ComponentName("android", "ProviderName");
	ZenPolicy zenPolicy = new ZenPolicy.Builder().allowAlarms(true).build();
	boolean isEnabled = true;
	AutomaticZenRule rule = new AutomaticZenRule("test", owner, owner, mock(Uri.class),
	zenPolicy, NotificationManager.INTERRUPTION_FILTER_PRIORITY, isEnabled);
	mBinderService.addAutomaticZenRule(rule, "another.package");

	// verify that zen mode helper gets passed in the package name from the arg, not the owner
	verify(mockZenModeHelper).addAutomaticZenRule(
	eq("another.package"), eq(rule), anyString());
	}

	@Test		@Test
	public void testAreNotificationsEnabledForPackage_crossUser() throws Exception {		public void testAreNotificationsEnabledForPackage_crossUser() throws Exception {
	try {		try {

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

+0 −30

Original line number	Original line	Diff line number	Diff line
	@@ -1426,36 +1426,6 @@ public class ZenModeHelperTest extends UiServiceTestCase {
	}		}
	}		}

	@Test
	public void testAddAutomaticZenRule_claimedSystemOwner() {
	// Make sure anything that claims to have a "system" owner but not actually part of the
	// system package still gets limited on number of rules
	for (int i = 0; i < RULE_LIMIT_PER_PACKAGE; i++) {
	ScheduleInfo si = new ScheduleInfo();
	si.startHour = i;
	AutomaticZenRule zenRule = new AutomaticZenRule("name" + i,
	new ComponentName("android", "ScheduleConditionProvider" + i),
	null, // configuration activity
	ZenModeConfig.toScheduleConditionId(si),
	new ZenPolicy.Builder().build(),
	NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
	String id = mZenModeHelperSpy.addAutomaticZenRule("pkgname", zenRule, "test");
	assertNotNull(id);
	}
	try {
	AutomaticZenRule zenRule = new AutomaticZenRule("name",
	new ComponentName("android", "ScheduleConditionProviderFinal"),
	null, // configuration activity
	ZenModeConfig.toScheduleConditionId(new ScheduleInfo()),
	new ZenPolicy.Builder().build(),
	NotificationManager.INTERRUPTION_FILTER_PRIORITY, true);
	String id = mZenModeHelperSpy.addAutomaticZenRule("pkgname", zenRule, "test");
	fail("allowed too many rules to be created");
	} catch (IllegalArgumentException e) {
	// yay
	}
	}

	private void setupZenConfig() {		private void setupZenConfig() {
	mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;		mZenModeHelperSpy.mZenMode = Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
	mZenModeHelperSpy.mConfig.allowAlarms = false;		mZenModeHelperSpy.mConfig.allowAlarms = false;