Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: ffb4fe7199

Change-Id: I95cbf838a85fb41c886570b9afe8f16947d49b43
This commit is contained in:
Mårten Kongstad
2018-09-12 17:38:03 -07:00
committed by android-build-merger
parent 50bec961b3 ffb4fe7199
commit 74eb2835ab
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
services/core/java/com/android/server/om/OverlayManagerService.java
View File

@@ -558,8 +558,8 @@ public final class OverlayManagerService extends SystemService {
@Override
public boolean setEnabledExclusive(@Nullable final String packageName, final boolean enable,
int userId) throws RemoteException {
enforceChangeOverlayPackagesPermission("setEnabled");
userId = handleIncomingUser(userId, "setEnabled");
enforceChangeOverlayPackagesPermission("setEnabledExclusive");
userId = handleIncomingUser(userId, "setEnabledExclusive");
if (packageName == null || !enable) {
return false;
}
@@ -578,8 +578,8 @@ public final class OverlayManagerService extends SystemService {
@Override
public boolean setEnabledExclusiveInCategory(@Nullable String packageName, int userId)
throws RemoteException {
enforceChangeOverlayPackagesPermission("setEnabled");
userId = handleIncomingUser(userId, "setEnabled");
enforceChangeOverlayPackagesPermission("setEnabledExclusiveInCategory");
userId = handleIncomingUser(userId, "setEnabledExclusiveInCategory");
if (packageName == null) {
return false;
}