Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename addPackageOverrides to putPackageOverrides."

Browse Source
This commit is contained in:
Tom Natan
2021-05-20 23:02:10 +00:00
committed by Gerrit Code Review
parent 95590e1a62 79fe2b53f8
commit 3e686651ad
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -1124,10 +1124,10 @@ package android.app.backup {
package android.app.compat { package android.app.compat {
public final class CompatChanges { 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 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, @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(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>); 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>);
} }

11
core/java/android/app/compat/CompatChanges.java
View File

@@ -100,9 +100,10 @@ public final class CompatChanges {
} }
/** /**
* Adds app compat overrides for a given package. This will check whether the caller is allowed * Associates app compat overrides with the given package and their respective change IDs.
* to perform this operation on the given apk and build. Only the installer package is allowed * This will check whether the caller is allowed to perform this operation on the given apk and
* to set overrides on a non-debuggable final build and a non-test apk. * 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 * <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 * 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. * @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) @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) { @NonNull Map<Long, PackageOverride> overrides) {
IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface( IPlatformCompat platformCompat = IPlatformCompat.Stub.asInterface(
ServiceManager.getService(Context.PLATFORM_COMPAT_SERVICE)); 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 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. * allowed to clear overrides on a non-debuggable final build and a non-test apk.
* *