diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-18 12:39:59 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-18 12:39:59 +0000 |
| commit | 409fb19ef322be0275dd960b4b9d0d4b866337c2 (patch) | |
| tree | b682162e3dce151786cfe363d1eb3c70a36c62da | |
| parent | b552650b4166361f307029921c1d28c8d02910d8 (diff) | |
| parent | ec2c13644c01177f26b5c851bd884de8325bad27 (diff) | |
| download | sdk-aml_sdk_340912010.tar.gz | |
Snap for 10513376 from ec2c13644c01177f26b5c851bd884de8325bad27 to mainline-sdkext-releaseaml_sdk_340912010
Change-Id: If0401c6c51ef5bcc4df3612cd6cd877bc5cbd2e6
| -rw-r--r-- | extensions/8/module-lib/framework-adservices.jar | bin | 57277 -> 57319 bytes | |||
| -rw-r--r-- | extensions/8/public/framework-mediaprovider.jar | bin | 34744 -> 34744 bytes | |||
| -rw-r--r-- | extensions/8/system/api/framework-adservices.txt | 8 | ||||
| -rw-r--r-- | extensions/8/system/framework-adservices.jar | bin | 56757 -> 56799 bytes |
4 files changed, 5 insertions, 3 deletions
diff --git a/extensions/8/module-lib/framework-adservices.jar b/extensions/8/module-lib/framework-adservices.jar Binary files differindex 2a424b3c7..f5e1266d3 100644 --- a/extensions/8/module-lib/framework-adservices.jar +++ b/extensions/8/module-lib/framework-adservices.jar diff --git a/extensions/8/public/framework-mediaprovider.jar b/extensions/8/public/framework-mediaprovider.jar Binary files differindex 9e2f10050..44eb9a426 100644 --- a/extensions/8/public/framework-mediaprovider.jar +++ b/extensions/8/public/framework-mediaprovider.jar diff --git a/extensions/8/system/api/framework-adservices.txt b/extensions/8/system/api/framework-adservices.txt index da0abbfd0..af2461207 100644 --- a/extensions/8/system/api/framework-adservices.txt +++ b/extensions/8/system/api/framework-adservices.txt @@ -24,17 +24,19 @@ package android.adservices.appsetid { package android.adservices.common { public class AdServicesCommonManager { - method @RequiresPermission(android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE) public void enableAdServices(@NonNull android.adservices.common.AdServicesStates, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>); + method @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE_COMPAT}) public void enableAdServices(@NonNull android.adservices.common.AdServicesStates, @NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>); method @NonNull public static android.adservices.common.AdServicesCommonManager get(@NonNull android.content.Context); - method @RequiresPermission(android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE) public void isAdServicesEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>); - method @RequiresPermission(android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE) public void setAdServicesEnabled(boolean, boolean); + method @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.ACCESS_ADSERVICES_STATE_COMPAT}) public void isAdServicesEnabled(@NonNull java.util.concurrent.Executor, @NonNull android.os.OutcomeReceiver<java.lang.Boolean,java.lang.Exception>); + method @RequiresPermission(anyOf={android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE, android.adservices.common.AdServicesPermissions.MODIFY_ADSERVICES_STATE_COMPAT}) public void setAdServicesEnabled(boolean, boolean); } public class AdServicesPermissions { field public static final String ACCESS_ADSERVICES_STATE = "android.permission.ACCESS_ADSERVICES_STATE"; + field public static final String ACCESS_ADSERVICES_STATE_COMPAT = "android.permission.ACCESS_ADSERVICES_STATE_COMPAT"; field public static final String ACCESS_PRIVILEGED_AD_ID = "android.permission.ACCESS_PRIVILEGED_AD_ID"; field public static final String ACCESS_PRIVILEGED_APP_SET_ID = "android.permission.ACCESS_PRIVILEGED_APP_SET_ID"; field public static final String MODIFY_ADSERVICES_STATE = "android.permission.MODIFY_ADSERVICES_STATE"; + field public static final String MODIFY_ADSERVICES_STATE_COMPAT = "android.permission.MODIFY_ADSERVICES_STATE_COMPAT"; } public final class AdServicesStates implements android.os.Parcelable { diff --git a/extensions/8/system/framework-adservices.jar b/extensions/8/system/framework-adservices.jar Binary files differindex fc4f6d44a..9f4417d8e 100644 --- a/extensions/8/system/framework-adservices.jar +++ b/extensions/8/system/framework-adservices.jar |