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

Commit 8d6571ae authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge changes I5851dd16,Id196307f into pi-dev 

* changes:
  OMS: harden permission checks
  Add missing fields to OverlayInfo.hashCode
parents d99e347f f28bec41

core/java/android/content/om/OverlayInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -261,6 +261,7 @@ public final class OverlayInfo implements Parcelable { 
        result = prime * result + state;

        result = prime * result + ((packageName == null) ? 0 : packageName.hashCode());

        result = prime * result + ((targetPackageName == null) ? 0 : targetPackageName.hashCode());

        result = prime * result + ((category == null) ? 0 : category.hashCode());

        result = prime * result + ((baseCodePath == null) ? 0 : baseCodePath.hashCode());

        return result;

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ public final class OverlayManagerService extends SystemService { 
         * @throws SecurityException if the permission check fails

         */

        private void enforceChangeOverlayPackagesPermission(@NonNull final String message) {

            getContext().enforceCallingOrSelfPermission(

            getContext().enforceCallingPermission(

                    android.Manifest.permission.CHANGE_OVERLAY_PACKAGES, message);

        }
@@ -691,8 +691,7 @@ public final class OverlayManagerService extends SystemService { 
         * @throws SecurityException if the permission check fails

         */

        private void enforceDumpPermission(@NonNull final String message) {

            getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DUMP,

                    message);

            getContext().enforceCallingPermission(android.Manifest.permission.DUMP, message);

        }

    };