DO NOT MERGE - Merge pi-platform-release (PPRL.190605.003) into stage-aosp-master (0e0787f4) · Commits · e / os / android_frameworks_base

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -2189,6 +2189,11 @@ public class NotificationManagerService extends SystemService {
		@Override
		public boolean areNotificationsEnabledForPackage(String pkg, int uid) {
		checkCallerIsSystemOrSameApp(pkg);
		if (UserHandle.getCallingUserId() != UserHandle.getUserId(uid)) {
		getContext().enforceCallingPermission(
		android.Manifest.permission.INTERACT_ACROSS_USERS,
		"canNotifyAsPackage for uid " + uid);
		}

		return mRankingHelper.getImportance(pkg, uid) != IMPORTANCE_NONE;
		}

services/core/java/com/android/server/pm/PackageManagerService.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -18305,6 +18305,12 @@ public class PackageManagerService extends IPackageManager.Stub
		@Override
		public boolean isPackageDeviceAdminOnAnyUser(String packageName) {
		final int callingUid = Binder.getCallingUid();
		if (checkUidPermission(android.Manifest.permission.MANAGE_USERS, callingUid)
		!= PERMISSION_GRANTED) {
		EventLog.writeEvent(0x534e4554, "128599183", -1, "");
		throw new SecurityException(android.Manifest.permission.MANAGE_USERS
		+ " permission is required to call this API");
		}
		if (getInstantAppPackageName(callingUid) != null
		&& !isCallerSameApp(packageName, callingUid)) {
		return false;

services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -3934,6 +3934,9 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager {

		@Override
		public boolean isSeparateProfileChallengeAllowed(int userHandle) {
		if (!isCallerWithSystemUid()) {
		throw new SecurityException("Caller must be system");
		}
		ComponentName profileOwner = getProfileOwner(userHandle);
		// Profile challenge is supported on N or newer release.
		return profileOwner != null &&

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,7 @@ import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_SCREEN_ON
		import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
		import static android.content.pm.PackageManager.FEATURE_WATCH;
		import static android.content.pm.PackageManager.PERMISSION_DENIED;
		import static android.content.pm.PackageManager.PERMISSION_GRANTED;
		import static android.os.Build.VERSION_CODES.O_MR1;
		import static android.os.Build.VERSION_CODES.P;

		@@ -106,6 +107,7 @@ import android.testing.AndroidTestingRunner;
		import android.testing.TestableContext;
		import android.testing.TestableLooper;
		import android.testing.TestableLooper.RunWithLooper;
		import android.testing.TestablePermissions;
		import android.text.Html;
		import android.util.ArrayMap;
		import android.util.AtomicFile;
		@@ -3145,4 +3147,21 @@ public class NotificationManagerServiceTest extends UiServiceTestCase {

		assertEquals(0, captor.getValue().getNotification().flags);
		}

		@Test
		public void testAreNotificationsEnabledForPackage_crossUser() throws Exception {
		try {
		mBinderService.areNotificationsEnabledForPackage(mContext.getPackageName(),
		mUid + UserHandle.PER_USER_RANGE);
		fail("Cannot call cross user without permission");
		} catch (SecurityException e) {
		// pass
		}

		// cross user, with permission, no problem
		TestablePermissions perms = mContext.getTestablePermissions();
		perms.setPermission(android.Manifest.permission.INTERACT_ACROSS_USERS, PERMISSION_GRANTED);
		mBinderService.areNotificationsEnabledForPackage(mContext.getPackageName(),
		mUid + UserHandle.PER_USER_RANGE);
		}
		}