From b706bd3e98db9cd49947db09d3b74cc1506b918d Mon Sep 17 00:00:00 2001 From: tomnatan Date: Tue, 18 May 2021 09:23:50 +0000 Subject: [PATCH] Rename addPackageOverrides to putPackageOverrides. Bug: 187738991 Test: atest FrameworksServicesTests:CompatConfigTest Test: atest FrameworksServicesTests:PlatformCompatTest Marged-In: I52e5051810cf31cbcee9ba600c92c86d335187a0 Change-Id: I52e5051810cf31cbcee9ba600c92c86d335187a0 --- core/api/system-current.txt | 2 +- core/java/android/app/compat/CompatChanges.java | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/api/system-current.txt b/core/api/system-current.txt index 8e13c33b4d7ec..e32f92c7ba6bd 100644 --- a/core/api/system-current.txt +++ b/core/api/system-current.txt @@ -1243,10 +1243,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); 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); method @RequiresPermission(android.Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD) public static void removePackageOverrides(@NonNull String, @NonNull java.util.Set); } diff --git a/core/java/android/app/compat/CompatChanges.java b/core/java/android/app/compat/CompatChanges.java index 8ca43c4a8e707..24ca72c66ab48 100644 --- a/core/java/android/app/compat/CompatChanges.java +++ b/core/java/android/app/compat/CompatChanges.java @@ -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. * *

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 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. *