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

Commit 4d47f346 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Merge "Explicitly allow shell to update listener/assist" into oc-mr1-dev 

am: 24a94491

Change-Id: Iaefcb277dffd79f0851d759df8afbf3bbc1d14b5
parents c3860b3b 24a94491

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

+2 −2
Original line number Diff line number Diff line
@@ -2823,7 +2823,7 @@ public class NotificationManagerService extends SystemService { 
        public void setNotificationListenerAccessGrantedForUser(ComponentName listener, int userId,

                boolean granted) throws RemoteException {

            Preconditions.checkNotNull(listener);

            enforceSystemOrSystemUI("grant notification listener access");

            checkCallerIsSystemOrShell();

            if (!mActivityManager.isLowRamDevice()) {

                mConditionProviders.setPackageOrComponentEnabled(listener.flattenToString(),

                        userId, false, granted);
@@ -2844,7 +2844,7 @@ public class NotificationManagerService extends SystemService { 
        public void setNotificationAssistantAccessGrantedForUser(ComponentName assistant,

                int userId, boolean granted) throws RemoteException {

            Preconditions.checkNotNull(assistant);

            enforceSystemOrSystemUI("grant notification assistant access");

            checkCallerIsSystemOrShell();

            if (!mActivityManager.isLowRamDevice()) {

                mConditionProviders.setPackageOrComponentEnabled(assistant.flattenToString(),

                        userId, false, granted);