Merge "Prevent accidental creation of PackagePreferences for non-existing... (54589718) · Commits · e / os / android_frameworks_base

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

+27 −15

Original line number	Diff line number	Diff line
		@@ -75,6 +75,7 @@ import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_CRITICAL;
		import static android.os.IServiceManager.DUMP_FLAG_PRIORITY_NORMAL;
		import static android.os.PowerWhitelistManager.REASON_NOTIFICATION_SERVICE;
		import static android.os.PowerWhitelistManager.TEMPORARY_ALLOWLIST_TYPE_FOREGROUND_SERVICE_ALLOWED;
		import static android.os.Process.INVALID_UID;
		import static android.os.UserHandle.USER_NULL;
		import static android.os.UserHandle.USER_SYSTEM;
		import static android.service.notification.NotificationListenerService.FLAG_FILTER_TYPE_ALERTING;
		@@ -402,7 +403,6 @@ public class NotificationManagerService extends SystemService {

		static final long SNOOZE_UNTIL_UNSPECIFIED = -1;

		static final int INVALID_UID = -1;
		static final String ROOT_PKG = "root";

		static final String[] ALLOWED_ADJUSTMENTS = new String[] {
		@@ -4005,7 +4005,7 @@ public class NotificationManagerService extends SystemService {
		String conversationId) {
		if (canNotifyAsPackage(callingPkg, targetPkg, userId)
		\|\| isCallerIsSystemOrSysemUiOrShell()) {
		int targetUid = -1;
		int targetUid = INVALID_UID;
		try {
		targetUid = mPackageManagerClient.getPackageUidAsUser(targetPkg, userId);
		} catch (NameNotFoundException e) {
		@@ -4257,7 +4257,7 @@ public class NotificationManagerService extends SystemService {
		String callingPkg, String targetPkg, int userId) {
		if (canNotifyAsPackage(callingPkg, targetPkg, userId)
		\|\| isCallingUidSystem()) {
		int targetUid = -1;
		int targetUid = INVALID_UID;
		try {
		targetUid = mPackageManagerClient.getPackageUidAsUser(targetPkg, userId);
		} catch (NameNotFoundException e) {
		@@ -5876,14 +5876,12 @@ public class NotificationManagerService extends SystemService {
		}

		private int getUidForPackageAndUser(String pkg, UserHandle user) throws RemoteException {
		int uid = INVALID_UID;
		final long identity = Binder.clearCallingIdentity();
		try {
		uid = mPackageManager.getPackageUid(pkg, 0, user.getIdentifier());
		return mPackageManager.getPackageUid(pkg, 0, user.getIdentifier());
		} finally {
		Binder.restoreCallingIdentity(identity);
		}
		return uid;
		}

		@Override
		@@ -11864,15 +11862,22 @@ public class NotificationManagerService extends SystemService {
		List<UserHandle> users = mUm.getUserHandles(/* excludeDying */ true);
		mNonBlockableDefaultApps = new ArrayMap<>();
		for (int i = 0; i < NON_BLOCKABLE_DEFAULT_ROLES.length; i++) {
		String role = NON_BLOCKABLE_DEFAULT_ROLES[i];
		final ArrayMap<Integer, ArraySet<String>> userToApprovedList = new ArrayMap<>();
		mNonBlockableDefaultApps.put(NON_BLOCKABLE_DEFAULT_ROLES[i], userToApprovedList);
		mNonBlockableDefaultApps.put(role, userToApprovedList);
		for (int j = 0; j < users.size(); j++) {
		Integer userId = users.get(j).getIdentifier();
		int userId = users.get(j).getIdentifier();
		ArraySet<String> approvedForUserId = new ArraySet<>(mRm.getRoleHoldersAsUser(
		NON_BLOCKABLE_DEFAULT_ROLES[i], UserHandle.of(userId)));
		role, UserHandle.of(userId)));
		ArraySet<Pair<String, Integer>> approvedAppUids = new ArraySet<>();
		for (String pkg : approvedForUserId) {
		approvedAppUids.add(new Pair(pkg, getUidForPackage(pkg, userId)));
		int uid = getUidForPackage(pkg, userId);
		if (uid != INVALID_UID) {
		approvedAppUids.add(new Pair<>(pkg, uid));
		} else {
		Slog.e(TAG, "init: Invalid package for role " + role
		+ " (user " + userId + "): " + pkg);
		}
		}
		userToApprovedList.put(userId, approvedForUserId);
		mPreferencesHelper.updateDefaultApps(userId, null, approvedAppUids);
		@@ -11938,8 +11943,13 @@ public class NotificationManagerService extends SystemService {
		}
		for (String nowApproved : roleHolders) {
		if (!previouslyApproved.contains(nowApproved)) {
		toAdd.add(new Pair(nowApproved,
		getUidForPackage(nowApproved, user.getIdentifier())));
		int uid = getUidForPackage(nowApproved, user.getIdentifier());
		if (uid != INVALID_UID) {
		toAdd.add(new Pair<>(nowApproved, uid));
		} else {
		Slog.e(TAG, "onRoleHoldersChanged: Invalid package for role " + roleName
		+ " (user " + user.getIdentifier() + "): " + nowApproved);
		}
		}
		}

		@@ -11979,10 +11989,12 @@ public class NotificationManagerService extends SystemService {
		UserHandle user = users[i];
		for (String pkg : mRm.getRoleHoldersAsUser(RoleManager.ROLE_BROWSER, user)) {
		int uid = getUidForPackage(pkg, user.getIdentifier());
		if (uid != -1) {
		if (uid != INVALID_UID) {
		newUids.add(uid);
		} else {
		Slog.e(TAG, "Bad uid (-1) for browser package " + pkg);
		Slog.e(TAG, "updateTrampoline: Invalid package for role "
		+ RoleManager.ROLE_BROWSER + " (user " + user.getIdentifier()
		+ "): " + pkg);
		}
		}
		}
		@@ -11995,7 +12007,7 @@ public class NotificationManagerService extends SystemService {
		} catch (RemoteException e) {
		Slog.e(TAG, "role manager has bad default " + pkg + " " + userId);
		}
		return -1;
		return INVALID_UID;
		}
		}

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

+92 −79

File changed.

Preview size limit exceeded, changes collapsed.

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

100755 → 100644

+52 −0

File changed.File mode changed from 100755 to 100644.

Preview size limit exceeded, changes collapsed.

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

+54 −59

File changed.

Preview size limit exceeded, changes collapsed.

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

+32 −1

Original line number	Diff line number	Diff line
		@@ -25,11 +25,15 @@ import static junit.framework.Assert.assertFalse;
		import static junit.framework.Assert.assertTrue;

		import static org.mockito.ArgumentMatchers.anyBoolean;
		import static org.mockito.Matchers.eq;
		import static org.mockito.ArgumentMatchers.anyLong;
		import static org.mockito.ArgumentMatchers.eq;
		import static org.mockito.Mockito.any;
		import static org.mockito.Mockito.doReturn;
		import static org.mockito.Mockito.doThrow;
		import static org.mockito.Mockito.mock;
		import static org.mockito.Mockito.times;
		import static org.mockito.Mockito.verify;
		import static org.mockito.Mockito.verifyNoMoreInteractions;
		import static org.mockito.Mockito.when;

		import static java.util.Arrays.asList;
		@@ -49,6 +53,7 @@ import android.content.pm.IPackageManager;
		import android.content.pm.PackageManager;
		import android.os.Looper;
		import android.os.PowerManager;
		import android.os.RemoteException;
		import android.os.UserHandle;
		import android.os.UserManager;
		import android.permission.PermissionManager;
		@@ -233,6 +238,32 @@ public class RoleObserverTest extends UiServiceTestCase {
		verify(mPreferencesHelper, times(1)).updateDefaultApps(0, null, emer0Pair);
		}

		@Test
		public void testInit_withInvalidPackages_invalidIgnored() throws Exception {
		UserHandle user = new UserHandle(0);
		when(mUm.getUserHandles(anyBoolean())).thenReturn(List.of(user));
		String invalidDialerPkg = "invalidDialer";
		String validEmergencyPkg = "emergency";
		doThrow(new RemoteException(new PackageManager.NameNotFoundException())).when(mPm)
		.getPackageUid(eq(invalidDialerPkg), anyLong(), eq(user.getIdentifier()));
		doReturn(40).when(mPm)
		.getPackageUid(eq(validEmergencyPkg), anyLong(), eq(user.getIdentifier()));
		when(mRoleManager.getRoleHoldersAsUser(ROLE_DIALER, user))
		.thenReturn(List.of(invalidDialerPkg));
		when(mRoleManager.getRoleHoldersAsUser(ROLE_EMERGENCY, user))
		.thenReturn(List.of(validEmergencyPkg));

		mRoleObserver.init();

		// Only valid packages were passed to PreferencesHelper
		ArraySet<Pair<String, Integer>> expectedEmergencyApps = new ArraySet<>();
		expectedEmergencyApps.add(new Pair<>(validEmergencyPkg, 40));
		ArraySet<Pair<String, Integer>> expectedDialerApps = new ArraySet<>();
		verify(mPreferencesHelper).updateDefaultApps(0, null, expectedEmergencyApps);
		verify(mPreferencesHelper).updateDefaultApps(0, null, expectedDialerApps);
		verifyNoMoreInteractions(mPreferencesHelper);
		}

		@Test
		public void testInit_forTrampolines() throws Exception {
		when(mPm.getPackageUid("com.browser", MATCH_ALL, 0)).thenReturn(30);