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

Commit 23ea43b0 authored by Tom Natan's avatar Tom Natan Committed by Automerger Merge Worker
Browse files

Merge "Rename addPackageOverrides to putPackageOverrides." am: 3e686651 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1710628

Change-Id: I16e4e65a4afe32f903a5327c958e11530f88f6b8
parents d922359e 3e686651

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1124,10 +1124,10 @@ package android.app.backup { 
package android.app.compat {















  public final class CompatChanges {













    method @RequiresPermission(android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD) public static void addPackageOverrides(@NonNull String, @NonNull java.util.Map<java.lang.Long,android.app.compat.PackageOverride>);















    method public static boolean isChangeEnabled(long);















    method @RequiresPermission(allOf={"android.permission.READ_COMPAT_CHANGE_CONFIG", "android.permission.LOG_COMPAT_CHANGE"}) public static boolean isChangeEnabled(long, @NonNull String, @NonNull android.os.UserHandle);















    method @RequiresPermission(allOf={"android.permission.READ_COMPAT_CHANGE_CONFIG", "android.permission.LOG_COMPAT_CHANGE"}) public static boolean isChangeEnabled(long, int);













    method @RequiresPermission(android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD) public static void putPackageOverrides(@NonNull String, @NonNull java.util.Map<java.lang.Long,android.app.compat.PackageOverride>);















    method @RequiresPermission(android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD) public static void removePackageOverrides(@NonNull String, @NonNull java.util.Set<java.lang.Long>);















  }















































core/java/android/app/compat/CompatChanges.java



+6
−5




























Original line number
Diff line number
Diff line








@@ -100,9 +100,10 @@ public final class CompatChanges {













    }































    /**













     * Adds app compat overrides for a given package. This will check whether the caller is allowed













     * to perform this operation on the given apk and build. Only the installer package is allowed













     * to set overrides on a non-debuggable final build and a non-test apk.













     * Associates app compat overrides with the given package and their respective change IDs.













     * This will check whether the caller is allowed to perform this operation on the given apk and













     * build. Only the installer package is allowed to set overrides on a non-debuggable final













     * build and a non-test apk.















     *















     * <p>Note that calling this method doesn't remove previously added overrides for the given















     * package if their change ID isn't in the given map, only replaces those that have the same









@@ -112,7 +113,7 @@ public final class CompatChanges {













     * @param overrides A map from change ID to the override applied for this change ID.















     */















    @RequiresPermission(android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD)













    public static void addPackageOverrides(@NonNull String packageName,













    public static void putPackageOverrides(@NonNull String packageName,















            @NonNull Map<Long, PackageOverride> overrides) {















        IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(















                ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE));









@@ -125,7 +126,7 @@ public final class CompatChanges {













    }































    /**













     * Removes app compat overrides for a given package. This will check whether the caller is













     * Removes app compat overrides for the given package. This will check whether the caller is















     * allowed to perform this operation on the given apk and build. Only the installer package is















     * allowed to clear overrides on a non-debuggable final build and a non-test apk.















     *