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

Commit c0c14237 authored by Mårten Kongstad's avatar Mårten Kongstad Committed by android-build-merger
Browse files

Merge "OMS: fix typos in permission check message" am: 57e5e683 am: ffb4fe71 

am: 74eb2835

Change-Id: I9c815d76916b4516022b09c31e9afcd11a107e26
parents 2bb42051 74eb2835

services/core/java/com/android/server/om/OverlayManagerService.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -558,8 +558,8 @@ public final class OverlayManagerService extends SystemService { 
        @Override

        @Override

        public boolean setEnabledExclusive(@Nullable final String packageName, final boolean enable,

        public boolean setEnabledExclusive(@Nullable final String packageName, final boolean enable,

                int userId) throws RemoteException {

                int userId) throws RemoteException {

            enforceChangeOverlayPackagesPermission("setEnabled");

            enforceChangeOverlayPackagesPermission("setEnabledExclusive");

            userId = handleIncomingUser(userId, "setEnabled");

            userId = handleIncomingUser(userId, "setEnabledExclusive");

            if (packageName == null || !enable) {

            if (packageName == null || !enable) {

                return false;

                return false;

            }

            }
@@ -578,8 +578,8 @@ public final class OverlayManagerService extends SystemService { 
        @Override

        @Override

        public boolean setEnabledExclusiveInCategory(@Nullable String packageName, int userId)

        public boolean setEnabledExclusiveInCategory(@Nullable String packageName, int userId)

                throws RemoteException {

                throws RemoteException {

            enforceChangeOverlayPackagesPermission("setEnabled");

            enforceChangeOverlayPackagesPermission("setEnabledExclusiveInCategory");

            userId = handleIncomingUser(userId, "setEnabled");

            userId = handleIncomingUser(userId, "setEnabledExclusiveInCategory");

            if (packageName == null) {

            if (packageName == null) {

                return false;

                return false;

            }

            }