commit 4a20233d8dbd7badc7ab7788537167d25a3387cf
author Winson Chung <winsonc@google.com> Tue Mar 19 17:15:44 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 19 17:15:44 2019 +0000
tree ba9a5634bd02e83be457926b31d81880eacb63f9
parent 21d24541f0869303e1d1c99d3db5c1c432eda478
parent ddaf351e77cce652f28304010139abb8166042a7

Merge "Allow apps with shared system uid to change overlays"

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

diff --git a/services/core/java/com/android/server/om/OverlayManagerService.java b/services/core/java/com/android/server/om/OverlayManagerService.java
index 8905eb9..37dd63a 100644
--- a/services/core/java/com/android/server/om/OverlayManagerService.java
+++ b/services/core/java/com/android/server/om/OverlayManagerService.java
@@ -758,7 +758,7 @@
          * @throws SecurityException if the permission check fails
          */
         private void enforceChangeOverlayPackagesPermission(@NonNull final String message) {
-            getContext().enforceCallingPermission(
+            getContext().enforceCallingOrSelfPermission(
                     android.Manifest.permission.CHANGE_OVERLAY_PACKAGES, message);
         }
 
@@ -769,7 +769,7 @@
          * @throws SecurityException if the permission check fails
          */
         private void enforceDumpPermission(@NonNull final String message) {
-            getContext().enforceCallingPermission(android.Manifest.permission.DUMP, message);
+            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DUMP, message);
         }
     };