summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTom Natan <tomnatan@google.com>2021-05-21 06:53:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-05-21 06:53:56 +0000
commit02f8f6cc9a002d6173d8cb2aed142fced4c0dc50 (patch)
tree7408b958cf86a8df1f887a3dbab3fb4ef4f1daa8 /core/java
parentcc6b51013074266617a8cf410a4e90d59ad25582 (diff)
parentb706bd3e98db9cd49947db09d3b74cc1506b918d (diff)
Merge "Rename addPackageOverrides to putPackageOverrides." into sc-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/app/compat/CompatChanges.java11
1 files changed, 6 insertions, 5 deletions
diff --git a/core/java/android/app/compat/CompatChanges.java b/core/java/android/app/compat/CompatChanges.java
index 8ca43c4a8e70..24ca72c66ab4 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.
*
* <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.
*