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

Merge "Add @RequiresPemission compat framework APIs." into rvc-dev am: 81958ce9b4

Browse Source 
Change-Id: Ie3dd5d4a5d8b81789ea4a1894c2ddec84bc4ffcd
This commit is contained in:
Automerger Merge Worker
2020-03-02 17:26:20 +00:00
parent 4e71e80108 81958ce9b4
commit a8f587a48f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
api/system-current.txt
View File

@@ -1170,8 +1170,8 @@ package android.app.compat {
public final class CompatChanges { public final class CompatChanges {
method public static boolean isChangeEnabled(long); method public static boolean isChangeEnabled(long);
method 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 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);
} }
} }

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

@@ -17,6 +17,7 @@
package android.app.compat; package android.app.compat;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.RequiresPermission;
import android.annotation.SystemApi; import android.annotation.SystemApi;
import android.compat.Compatibility; import android.compat.Compatibility;
import android.os.UserHandle; import android.os.UserHandle;
@@ -54,14 +55,13 @@ public final class CompatChanges {
* <p> Note that this involves a binder call to the system server (unless running in the system * <p> Note that this involves a binder call to the system server (unless running in the system
* server). If the binder call fails, a {@code RuntimeException} will be thrown. * server). If the binder call fails, a {@code RuntimeException} will be thrown.
* *
* <p> Caller must have android.permission.READ_COMPAT_CHANGE_CONFIG permission. If it
* doesn't, a {@code RuntimeException} will be thrown.
*
* @param changeId The ID of the compatibility change in question. * @param changeId The ID of the compatibility change in question.
* @param packageName The package name of the app in question. * @param packageName The package name of the app in question.
* @param user The user that the operation is done for. * @param user The user that the operation is done for.
* @return {@code true} if the change is enabled for the current app. * @return {@code true} if the change is enabled for the current app.
*/ */
@RequiresPermission(allOf = {android.Manifest.permission.READ_COMPAT_CHANGE_CONFIG,
android.Manifest.permission.LOG_COMPAT_CHANGE})
public static boolean isChangeEnabled(long changeId, @NonNull String packageName, public static boolean isChangeEnabled(long changeId, @NonNull String packageName,
@NonNull UserHandle user) { @NonNull UserHandle user) {
return QUERY_CACHE.query(ChangeIdStateQuery.byPackageName(changeId, packageName, return QUERY_CACHE.query(ChangeIdStateQuery.byPackageName(changeId, packageName,
@@ -75,9 +75,6 @@ public final class CompatChanges {
* <p> Note that this involves a binder call to the system server (unless running in the system * <p> Note that this involves a binder call to the system server (unless running in the system
* server). If the binder call fails, {@code RuntimeException} will be thrown. * server). If the binder call fails, {@code RuntimeException} will be thrown.
* *
* <p> Caller must have android.permission.READ_COMPAT_CHANGE_CONFIG permission. If it
* doesn't, a {@code RuntimeException} will be thrown.
*
* <p> Returns {@code true} if there are no installed packages for the required UID, or if the * <p> Returns {@code true} if there are no installed packages for the required UID, or if the
* change is enabled for ALL of the installed packages associated with the provided UID. Please * change is enabled for ALL of the installed packages associated with the provided UID. Please
* use a more specific API if you want a different behaviour for multi-package UIDs. * use a more specific API if you want a different behaviour for multi-package UIDs.
@@ -86,6 +83,8 @@ public final class CompatChanges {
* @param uid The UID of the app in question. * @param uid The UID of the app in question.
* @return {@code true} if the change is enabled for the current app. * @return {@code true} if the change is enabled for the current app.
*/ */
@RequiresPermission(allOf = {android.Manifest.permission.READ_COMPAT_CHANGE_CONFIG,
android.Manifest.permission.LOG_COMPAT_CHANGE})
public static boolean isChangeEnabled(long changeId, int uid) { public static boolean isChangeEnabled(long changeId, int uid) {
return QUERY_CACHE.query(ChangeIdStateQuery.byUid(changeId, uid)); return QUERY_CACHE.query(ChangeIdStateQuery.byUid(changeId, uid));
} }