Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a77c789d authored by Evan Chen's avatar Evan Chen Committed by Automerger Merge Worker
Browse files

Merge "Do not allow setting notification access across users." into tm-dev am: 2335fc14 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25096532



Change-Id: I95ea1749ddd8912d42a53f49bc3c9b14eaefc983
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b5aeeec9 2335fc14

services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java

+3 −5
Original line number Diff line number Diff line
@@ -543,8 +543,7 @@ public class CompanionDeviceManagerService extends SystemService { 
        public PendingIntent requestNotificationAccess(ComponentName component, int userId)

                throws RemoteException {

            String callingPackage = component.getPackageName();

            checkCanCallNotificationApi(callingPackage);

            // TODO: check userId.

            checkCanCallNotificationApi(callingPackage, userId);

            if (component.flattenToString().length() > MAX_CN_LENGTH) {

                throw new IllegalArgumentException("Component name is too long.");

            }
@@ -570,7 +569,7 @@ public class CompanionDeviceManagerService extends SystemService { 
        @Deprecated

        @Override

        public boolean hasNotificationAccess(ComponentName component) throws RemoteException {

            checkCanCallNotificationApi(component.getPackageName());

            checkCanCallNotificationApi(component.getPackageName(), getCallingUserId());

            NotificationManager nm = getContext().getSystemService(NotificationManager.class);

            return nm.isNotificationListenerAccessGranted(component);

        }
@@ -727,8 +726,7 @@ public class CompanionDeviceManagerService extends SystemService { 
            legacyCreateAssociation(userId, macAddress, packageName, null);

        }



        private void checkCanCallNotificationApi(String callingPackage) {

            final int userId = getCallingUserId();

        private void checkCanCallNotificationApi(String callingPackage, int userId) {

            enforceCallerIsSystemOr(userId, callingPackage);



            if (getCallingUid() == SYSTEM_UID) return;