Platform SDK prebuilt drop with topic fullsdk_9604814
Generated using arguments:
--build_id=9604814 --build_target=sdk --dest_host=aosp --dest_project=android-TPS --sdk_rootdir=android-33-ext5
The change is generated with prebuilt drop tool.
Merged-In: If70f995ba5d177a0c25a05713d7b9eae1ddfe8e0
Change-Id: I1b66ffb2f51a19a6416bad04c5dd0ff9efe33f96
diff --git a/.prebuilt_info/AndroidX/prebuilt_info_sdk-repo-linux-platforms-9604814_zip.asciipb b/.prebuilt_info/AndroidX/prebuilt_info_sdk-repo-linux-platforms-9604814_zip.asciipb
new file mode 100644
index 0000000..2aca2e5
--- /dev/null
+++ b/.prebuilt_info/AndroidX/prebuilt_info_sdk-repo-linux-platforms-9604814_zip.asciipb
@@ -0,0 +1,15 @@
+drops {
+ android_build_drop {
+ build_id: "9604814"
+ target: "sdk"
+ source_file: "sdk-repo-linux-platforms-9604814.zip"
+ }
+ dest_file: "sdk-repo-linux-platforms-9604814.zip"
+ version: ""
+ version_group: "AndroidX"
+ git_project: "platform/prebuilts/fullsdk/platforms/android-TPS"
+ git_branch: "master"
+ transform: TRANSFORM_UNZIP
+ transform_options {
+ }
+}
diff --git a/android-stubs-src.jar b/android-stubs-src.jar
index 14c6cae..334c4ef 100644
--- a/android-stubs-src.jar
+++ b/android-stubs-src.jar
Binary files differ
diff --git a/android.jar b/android.jar
index 1f08d59..037c311 100644
--- a/android.jar
+++ b/android.jar
Binary files differ
diff --git a/build.prop b/build.prop
index 16065a2..9b486d1 100644
--- a/build.prop
+++ b/build.prop
@@ -10,13 +10,13 @@
ro.system.product.cpu.abilist=x86
ro.system.product.cpu.abilist32=x86
ro.system.product.cpu.abilist64=
-ro.system.build.date=Wed Dec 7 17:46:39 UTC 2022
-ro.system.build.date.utc=1670435199
-ro.system.build.fingerprint=Android/sdk/mainline_x86:13/TSE4.221207.001/9380052:userdebug/test-keys
-ro.system.build.id=TSE4.221207.001
+ro.system.build.date=Tue Feb 14 16:42:50 UTC 2023
+ro.system.build.date.utc=1676392970
+ro.system.build.fingerprint=Android/sdk/mainline_x86:13/TSE5.230214.001/9604814:userdebug/test-keys
+ro.system.build.id=TSE5.230214.001
ro.system.build.tags=test-keys
ro.system.build.type=userdebug
-ro.system.build.version.incremental=9380052
+ro.system.build.version.incremental=9604814
ro.system.build.version.release=13
ro.system.build.version.release_or_codename=13
ro.system.build.version.sdk=33
@@ -25,9 +25,9 @@
####################################
# begin build properties
# autogenerated by buildinfo.sh
-ro.build.id=TSE4.221207.001
-ro.build.display.id=sdk-userdebug 13 TSE4.221207.001 9380052 test-keys
-ro.build.version.incremental=9380052
+ro.build.id=TSE5.230214.001
+ro.build.display.id=sdk-userdebug 13 TSE5.230214.001 9604814 test-keys
+ro.build.version.incremental=9604814
ro.build.version.sdk=33
ro.build.version.preview_sdk=0
ro.build.version.preview_sdk_fingerprint=REL
@@ -40,8 +40,8 @@
ro.build.version.security_patch=2022-07-05
ro.build.version.base_os=
ro.build.version.min_supported_target_sdk=23
-ro.build.date=Wed Dec 7 17:46:39 UTC 2022
-ro.build.date.utc=1670435199
+ro.build.date=Tue Feb 14 16:42:50 UTC 2023
+ro.build.date.utc=1676392970
ro.build.type=userdebug
ro.build.tags=test-keys
ro.build.flavor=sdk-userdebug
@@ -52,7 +52,7 @@
ro.wifi.channels=
# ro.build.product is obsolete; use ro.product.device
# Do not try to parse description or thumbprint
-ro.build.description=sdk-userdebug 13 TSE4.221207.001 9380052 test-keys
+ro.build.description=sdk-userdebug 13 TSE5.230214.001 9604814 test-keys
# end build properties
####################################
# from variable ADDITIONAL_SYSTEM_PROPERTIES
diff --git a/core-for-system-modules.jar b/core-for-system-modules.jar
index ba71557..2ff8af9 100644
--- a/core-for-system-modules.jar
+++ b/core-for-system-modules.jar
Binary files differ
diff --git a/data/annotations.zip b/data/annotations.zip
index 36747e6..8b53893 100644
--- a/data/annotations.zip
+++ b/data/annotations.zip
Binary files differ
diff --git a/data/api-versions.xml b/data/api-versions.xml
index 76a4028..96afe27 100644
--- a/data/api-versions.xml
+++ b/data/api-versions.xml
@@ -3648,26 +3648,26 @@
<method name="<init>(Ljava/lang/String;Ljava/lang/Throwable;)V"/>
<method name="<init>(Ljava/lang/Throwable;)V"/>
</class>
- <class name="android/adservices/AdServicesState" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/AdServicesState" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="isAdServicesStateEnabled()Z"/>
</class>
- <class name="android/adservices/AdServicesVersion" module="framework-adservices" since="33" sdks="1000000:3,33:3,0:33">
+ <class name="android/adservices/AdServicesVersion" module="framework-adservices" since="33" sdks="1000000:3,0:33">
<extends name="java/lang/Object"/>
<field name="API_VERSION"/>
</class>
- <class name="android/adservices/adid/AdId" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adid/AdId" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Ljava/lang/String;Z)V"/>
<method name="getAdId()Ljava/lang/String;"/>
<method name="isLimitAdTrackingEnabled()Z"/>
<field name="ZERO_OUT"/>
</class>
- <class name="android/adservices/adid/AdIdManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adid/AdIdManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getAdId(Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
- <class name="android/adservices/adselection/AdSelectionConfig" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/AdSelectionConfig" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getAdSelectionSignals()Landroid/adservices/common/AdSelectionSignals;"/>
@@ -3679,7 +3679,7 @@
<method name="getTrustedScoringSignalsUri()Landroid/net/Uri;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/adselection/AdSelectionConfig$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/AdSelectionConfig$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/adselection/AdSelectionConfig;"/>
@@ -3691,49 +3691,49 @@
<method name="setSellerSignals(Landroid/adservices/common/AdSelectionSignals;)Landroid/adservices/adselection/AdSelectionConfig$Builder;"/>
<method name="setTrustedScoringSignalsUri(Landroid/net/Uri;)Landroid/adservices/adselection/AdSelectionConfig$Builder;"/>
</class>
- <class name="android/adservices/adselection/AdSelectionManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/AdSelectionManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getTestAdSelectionManager()Landroid/adservices/adselection/TestAdSelectionManager;"/>
<method name="reportImpression(Landroid/adservices/adselection/ReportImpressionRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="selectAds(Landroid/adservices/adselection/AdSelectionConfig;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
- <class name="android/adservices/adselection/AdSelectionOutcome" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/AdSelectionOutcome" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getAdSelectionId()J"/>
<method name="getRenderUri()Landroid/net/Uri;"/>
</class>
- <class name="android/adservices/adselection/AdSelectionOutcome$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/AdSelectionOutcome$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/adselection/AdSelectionOutcome;"/>
<method name="setAdSelectionId(J)Landroid/adservices/adselection/AdSelectionOutcome$Builder;"/>
<method name="setRenderUri(Landroid/net/Uri;)Landroid/adservices/adselection/AdSelectionOutcome$Builder;"/>
</class>
- <class name="android/adservices/adselection/AddAdSelectionOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/AddAdSelectionOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Landroid/adservices/adselection/AdSelectionConfig;Ljava/lang/String;Landroid/adservices/common/AdSelectionSignals;)V"/>
<method name="getAdSelectionConfig()Landroid/adservices/adselection/AdSelectionConfig;"/>
<method name="getDecisionLogicJs()Ljava/lang/String;"/>
<method name="getTrustedScoringSignals()Landroid/adservices/common/AdSelectionSignals;"/>
</class>
- <class name="android/adservices/adselection/RemoveAdSelectionOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/RemoveAdSelectionOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Landroid/adservices/adselection/AdSelectionConfig;)V"/>
<method name="getAdSelectionConfig()Landroid/adservices/adselection/AdSelectionConfig;"/>
</class>
- <class name="android/adservices/adselection/ReportImpressionRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/ReportImpressionRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(JLandroid/adservices/adselection/AdSelectionConfig;)V"/>
<method name="getAdSelectionConfig()Landroid/adservices/adselection/AdSelectionConfig;"/>
<method name="getAdSelectionId()J"/>
</class>
- <class name="android/adservices/adselection/TestAdSelectionManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/adselection/TestAdSelectionManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="overrideAdSelectionConfigRemoteInfo(Landroid/adservices/adselection/AddAdSelectionOverrideRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="removeAdSelectionConfigRemoteInfoOverride(Landroid/adservices/adselection/RemoveAdSelectionOverrideRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="resetAllAdSelectionConfigRemoteOverrides(Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
- <class name="android/adservices/appsetid/AppSetId" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/appsetid/AppSetId" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Ljava/lang/String;I)V"/>
<method name="getId()Ljava/lang/String;"/>
@@ -3741,45 +3741,45 @@
<field name="SCOPE_APP"/>
<field name="SCOPE_DEVELOPER"/>
</class>
- <class name="android/adservices/appsetid/AppSetIdManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/appsetid/AppSetIdManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getAppSetId(Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
- <class name="android/adservices/common/AdData" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/common/AdData" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getMetadata()Ljava/lang/String;"/>
<method name="getRenderUri()Landroid/net/Uri;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/common/AdData$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/common/AdData$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/common/AdData;"/>
<method name="setMetadata(Ljava/lang/String;)Landroid/adservices/common/AdData$Builder;"/>
<method name="setRenderUri(Landroid/net/Uri;)Landroid/adservices/common/AdData$Builder;"/>
</class>
- <class name="android/adservices/common/AdSelectionSignals" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/common/AdSelectionSignals" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="fromString(Ljava/lang/String;)Landroid/adservices/common/AdSelectionSignals;"/>
<field name="CREATOR"/>
<field name="EMPTY"/>
</class>
- <class name="android/adservices/common/AdServicesPermissions" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/common/AdServicesPermissions" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<field name="ACCESS_ADSERVICES_AD_ID"/>
<field name="ACCESS_ADSERVICES_ATTRIBUTION"/>
<field name="ACCESS_ADSERVICES_CUSTOM_AUDIENCE"/>
<field name="ACCESS_ADSERVICES_TOPICS"/>
</class>
- <class name="android/adservices/common/AdTechIdentifier" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/common/AdTechIdentifier" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="fromString(Ljava/lang/String;)Landroid/adservices/common/AdTechIdentifier;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/customaudience/AddCustomAudienceOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/AddCustomAudienceOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Landroid/adservices/common/AdTechIdentifier;Ljava/lang/String;Ljava/lang/String;Landroid/adservices/common/AdSelectionSignals;)V"/>
<method name="getBiddingLogicJs()Ljava/lang/String;"/>
@@ -3787,7 +3787,7 @@
<method name="getName()Ljava/lang/String;"/>
<method name="getTrustedBiddingSignals()Landroid/adservices/common/AdSelectionSignals;"/>
</class>
- <class name="android/adservices/customaudience/AddCustomAudienceOverrideRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/AddCustomAudienceOverrideRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/customaudience/AddCustomAudienceOverrideRequest;"/>
@@ -3796,7 +3796,7 @@
<method name="setName(Ljava/lang/String;)Landroid/adservices/customaudience/AddCustomAudienceOverrideRequest$Builder;"/>
<method name="setTrustedBiddingSignals(Landroid/adservices/common/AdSelectionSignals;)Landroid/adservices/customaudience/AddCustomAudienceOverrideRequest$Builder;"/>
</class>
- <class name="android/adservices/customaudience/CustomAudience" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/CustomAudience" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getActivationTime()Ljava/time/Instant;"/>
@@ -3810,7 +3810,7 @@
<method name="getUserBiddingSignals()Landroid/adservices/common/AdSelectionSignals;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/customaudience/CustomAudience$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/CustomAudience$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/customaudience/CustomAudience;"/>
@@ -3824,73 +3824,73 @@
<method name="setTrustedBiddingData(Landroid/adservices/customaudience/TrustedBiddingData;)Landroid/adservices/customaudience/CustomAudience$Builder;"/>
<method name="setUserBiddingSignals(Landroid/adservices/common/AdSelectionSignals;)Landroid/adservices/customaudience/CustomAudience$Builder;"/>
</class>
- <class name="android/adservices/customaudience/CustomAudienceManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/CustomAudienceManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getTestCustomAudienceManager()Landroid/adservices/customaudience/TestCustomAudienceManager;"/>
<method name="joinCustomAudience(Landroid/adservices/customaudience/JoinCustomAudienceRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="leaveCustomAudience(Landroid/adservices/customaudience/LeaveCustomAudienceRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
- <class name="android/adservices/customaudience/JoinCustomAudienceRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/JoinCustomAudienceRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getCustomAudience()Landroid/adservices/customaudience/CustomAudience;"/>
</class>
- <class name="android/adservices/customaudience/JoinCustomAudienceRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/JoinCustomAudienceRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/customaudience/JoinCustomAudienceRequest;"/>
<method name="setCustomAudience(Landroid/adservices/customaudience/CustomAudience;)Landroid/adservices/customaudience/JoinCustomAudienceRequest$Builder;"/>
</class>
- <class name="android/adservices/customaudience/LeaveCustomAudienceRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/LeaveCustomAudienceRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getBuyer()Landroid/adservices/common/AdTechIdentifier;"/>
<method name="getName()Ljava/lang/String;"/>
</class>
- <class name="android/adservices/customaudience/LeaveCustomAudienceRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/LeaveCustomAudienceRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/customaudience/LeaveCustomAudienceRequest;"/>
<method name="setBuyer(Landroid/adservices/common/AdTechIdentifier;)Landroid/adservices/customaudience/LeaveCustomAudienceRequest$Builder;"/>
<method name="setName(Ljava/lang/String;)Landroid/adservices/customaudience/LeaveCustomAudienceRequest$Builder;"/>
</class>
- <class name="android/adservices/customaudience/RemoveCustomAudienceOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/RemoveCustomAudienceOverrideRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Landroid/adservices/common/AdTechIdentifier;Ljava/lang/String;)V"/>
<method name="getBuyer()Landroid/adservices/common/AdTechIdentifier;"/>
<method name="getName()Ljava/lang/String;"/>
</class>
- <class name="android/adservices/customaudience/RemoveCustomAudienceOverrideRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/RemoveCustomAudienceOverrideRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/customaudience/RemoveCustomAudienceOverrideRequest;"/>
<method name="setBuyer(Landroid/adservices/common/AdTechIdentifier;)Landroid/adservices/customaudience/RemoveCustomAudienceOverrideRequest$Builder;"/>
<method name="setName(Ljava/lang/String;)Landroid/adservices/customaudience/RemoveCustomAudienceOverrideRequest$Builder;"/>
</class>
- <class name="android/adservices/customaudience/TestCustomAudienceManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/TestCustomAudienceManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="overrideCustomAudienceRemoteInfo(Landroid/adservices/customaudience/AddCustomAudienceOverrideRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="removeCustomAudienceRemoteInfoOverride(Landroid/adservices/customaudience/RemoveCustomAudienceOverrideRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="resetAllCustomAudienceOverrides(Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
- <class name="android/adservices/customaudience/TrustedBiddingData" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/TrustedBiddingData" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getTrustedBiddingKeys()Ljava/util/List;"/>
<method name="getTrustedBiddingUri()Landroid/net/Uri;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/customaudience/TrustedBiddingData$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/customaudience/TrustedBiddingData$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/customaudience/TrustedBiddingData;"/>
<method name="setTrustedBiddingKeys(Ljava/util/List;)Landroid/adservices/customaudience/TrustedBiddingData$Builder;"/>
<method name="setTrustedBiddingUri(Landroid/net/Uri;)Landroid/adservices/customaudience/TrustedBiddingData$Builder;"/>
</class>
- <class name="android/adservices/exceptions/AdServicesException" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/exceptions/AdServicesException" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Exception"/>
<method name="<init>(Ljava/lang/String;)V"/>
<method name="<init>(Ljava/lang/String;Ljava/lang/Throwable;)V"/>
</class>
- <class name="android/adservices/measurement/DeletionRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/DeletionRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getDeletionMode()I"/>
<method name="getDomainUris()Ljava/util/List;"/>
@@ -3903,7 +3903,7 @@
<field name="MATCH_BEHAVIOR_DELETE"/>
<field name="MATCH_BEHAVIOR_PRESERVE"/>
</class>
- <class name="android/adservices/measurement/DeletionRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/DeletionRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/measurement/DeletionRequest;"/>
@@ -3914,7 +3914,7 @@
<method name="setOriginUris(Ljava/util/List;)Landroid/adservices/measurement/DeletionRequest$Builder;"/>
<method name="setStart(Ljava/time/Instant;)Landroid/adservices/measurement/DeletionRequest$Builder;"/>
</class>
- <class name="android/adservices/measurement/MeasurementManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/MeasurementManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="deleteRegistrations(Landroid/adservices/measurement/DeletionRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
<method name="getMeasurementApiStatus(Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
@@ -3925,20 +3925,20 @@
<field name="MEASUREMENT_API_STATE_DISABLED"/>
<field name="MEASUREMENT_API_STATE_ENABLED"/>
</class>
- <class name="android/adservices/measurement/WebSourceParams" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebSourceParams" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getRegistrationUri()Landroid/net/Uri;"/>
<method name="isDebugKeyAllowed()Z"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/measurement/WebSourceParams$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebSourceParams$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Landroid/net/Uri;)V"/>
<method name="build()Landroid/adservices/measurement/WebSourceParams;"/>
<method name="setDebugKeyAllowed(Z)Landroid/adservices/measurement/WebSourceParams$Builder;"/>
</class>
- <class name="android/adservices/measurement/WebSourceRegistrationRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebSourceRegistrationRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getAppDestination()Landroid/net/Uri;"/>
@@ -3949,7 +3949,7 @@
<method name="getWebDestination()Landroid/net/Uri;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/measurement/WebSourceRegistrationRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebSourceRegistrationRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Ljava/util/List;Landroid/net/Uri;)V"/>
<method name="build()Landroid/adservices/measurement/WebSourceRegistrationRequest;"/>
@@ -3958,58 +3958,60 @@
<method name="setVerifiedDestination(Landroid/net/Uri;)Landroid/adservices/measurement/WebSourceRegistrationRequest$Builder;"/>
<method name="setWebDestination(Landroid/net/Uri;)Landroid/adservices/measurement/WebSourceRegistrationRequest$Builder;"/>
</class>
- <class name="android/adservices/measurement/WebTriggerParams" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebTriggerParams" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getRegistrationUri()Landroid/net/Uri;"/>
<method name="isDebugKeyAllowed()Z"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/measurement/WebTriggerParams$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebTriggerParams$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Landroid/net/Uri;)V"/>
<method name="build()Landroid/adservices/measurement/WebTriggerParams;"/>
<method name="setDebugKeyAllowed(Z)Landroid/adservices/measurement/WebTriggerParams$Builder;"/>
</class>
- <class name="android/adservices/measurement/WebTriggerRegistrationRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebTriggerRegistrationRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="getDestination()Landroid/net/Uri;"/>
<method name="getTriggerParams()Ljava/util/List;"/>
<field name="CREATOR"/>
</class>
- <class name="android/adservices/measurement/WebTriggerRegistrationRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/measurement/WebTriggerRegistrationRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Ljava/util/List;Landroid/net/Uri;)V"/>
<method name="build()Landroid/adservices/measurement/WebTriggerRegistrationRequest;"/>
</class>
- <class name="android/adservices/topics/GetTopicsRequest" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/topics/GetTopicsRequest" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getAdsSdkName()Ljava/lang/String;"/>
+ <method name="shouldRecordObservation()Z" sdks="1000000:5"/>
</class>
- <class name="android/adservices/topics/GetTopicsRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/topics/GetTopicsRequest$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="build()Landroid/adservices/topics/GetTopicsRequest;"/>
<method name="setAdsSdkName(Ljava/lang/String;)Landroid/adservices/topics/GetTopicsRequest$Builder;"/>
+ <method name="setShouldRecordObservation(Z)Landroid/adservices/topics/GetTopicsRequest$Builder;" sdks="1000000:5"/>
</class>
- <class name="android/adservices/topics/GetTopicsResponse" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/topics/GetTopicsResponse" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getTopics()Ljava/util/List;"/>
</class>
- <class name="android/adservices/topics/GetTopicsResponse$Builder" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/topics/GetTopicsResponse$Builder" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(Ljava/util/List;)V"/>
<method name="build()Landroid/adservices/topics/GetTopicsResponse;"/>
</class>
- <class name="android/adservices/topics/Topic" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/topics/Topic" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>(JJI)V"/>
<method name="getModelVersion()J"/>
<method name="getTaxonomyVersion()J"/>
<method name="getTopicId()I"/>
</class>
- <class name="android/adservices/topics/TopicsManager" module="framework-adservices" since="34" sdks="1000000:4,33:4">
+ <class name="android/adservices/topics/TopicsManager" module="framework-adservices" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="getTopics(Landroid/adservices/topics/GetTopicsRequest;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V"/>
</class>
@@ -9271,7 +9273,7 @@
<field name="ROLE_HOME"/>
<field name="ROLE_SMS"/>
</class>
- <class name="android/app/sdksandbox/LoadSdkException" module="framework-sdksandbox" since="34" sdks="1000000:4,33:4">
+ <class name="android/app/sdksandbox/LoadSdkException" module="framework-sdksandbox" since="34" sdks="1000000:4">
<extends name="java/lang/Exception"/>
<implements name="android/os/Parcelable"/>
<method name="<init>(Ljava/lang/Throwable;Landroid/os/Bundle;)V"/>
@@ -9279,7 +9281,7 @@
<method name="getLoadSdkErrorCode()I"/>
<field name="CREATOR"/>
</class>
- <class name="android/app/sdksandbox/RequestSurfacePackageException" module="framework-sdksandbox" since="34" sdks="1000000:4,33:4">
+ <class name="android/app/sdksandbox/RequestSurfacePackageException" module="framework-sdksandbox" since="34" sdks="1000000:4">
<extends name="java/lang/Exception"/>
<method name="<init>(ILjava/lang/String;)V"/>
<method name="<init>(ILjava/lang/String;Ljava/lang/Throwable;)V"/>
@@ -9287,14 +9289,15 @@
<method name="getExtraErrorInformation()Landroid/os/Bundle;"/>
<method name="getRequestSurfacePackageErrorCode()I"/>
</class>
- <class name="android/app/sdksandbox/SandboxedSdk" module="framework-sdksandbox" since="34" sdks="1000000:4,33:4">
+ <class name="android/app/sdksandbox/SandboxedSdk" module="framework-sdksandbox" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
<method name="<init>(Landroid/os/IBinder;)V"/>
<method name="getInterface()Landroid/os/IBinder;"/>
+ <method name="getSharedLibraryInfo()Landroid/content/pm/SharedLibraryInfo;" sdks="1000000:5"/>
<field name="CREATOR"/>
</class>
- <class name="android/app/sdksandbox/SandboxedSdkProvider" module="framework-sdksandbox" since="34" sdks="1000000:4,33:4">
+ <class name="android/app/sdksandbox/SandboxedSdkProvider" module="framework-sdksandbox" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="<init>()V"/>
<method name="attachContext(Landroid/content/Context;)V"/>
@@ -9303,34 +9306,45 @@
<method name="getView(Landroid/content/Context;Landroid/os/Bundle;II)Landroid/view/View;"/>
<method name="onLoadSdk(Landroid/os/Bundle;)Landroid/app/sdksandbox/SandboxedSdk;"/>
</class>
- <class name="android/app/sdksandbox/SdkSandboxManager" module="framework-sdksandbox" since="33" sdks="1000000:3,33:3,0:33">
+ <class name="android/app/sdksandbox/SdkSandboxManager" module="framework-sdksandbox" since="33" sdks="1000000:3,0:33">
<extends name="java/lang/Object"/>
- <method name="addSdkSandboxProcessDeathCallback(Ljava/util/concurrent/Executor;Landroid/app/sdksandbox/SdkSandboxManager$SdkSandboxProcessDeathCallback;)V" since="34" sdks="1000000:4,33:4"/>
+ <method name="addSdkSandboxProcessDeathCallback(Ljava/util/concurrent/Executor;Landroid/app/sdksandbox/SdkSandboxManager$SdkSandboxProcessDeathCallback;)V" since="34" sdks="1000000:4"/>
+ <method name="addSyncedSharedPreferencesKeys(Ljava/util/Set;)V" since="34" sdks="1000000:5"/>
+ <method name="getSandboxedSdks()Ljava/util/List;" since="34" sdks="1000000:5"/>
<method name="getSdkSandboxState()I"/>
- <method name="loadSdk(Ljava/lang/String;Landroid/os/Bundle;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V" since="34" sdks="1000000:4,33:4"/>
- <method name="removeSdkSandboxProcessDeathCallback(Landroid/app/sdksandbox/SdkSandboxManager$SdkSandboxProcessDeathCallback;)V" since="34" sdks="1000000:4,33:4"/>
- <method name="requestSurfacePackage(Ljava/lang/String;Landroid/os/Bundle;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V" since="34" sdks="1000000:4,33:4"/>
- <method name="unloadSdk(Ljava/lang/String;)V" since="34" sdks="1000000:4,33:4"/>
- <field name="EXTRA_DISPLAY_ID" since="34" sdks="1000000:4,33:4"/>
- <field name="EXTRA_HEIGHT_IN_PIXELS" since="34" sdks="1000000:4,33:4"/>
- <field name="EXTRA_HOST_TOKEN" since="34" sdks="1000000:4,33:4"/>
- <field name="EXTRA_SURFACE_PACKAGE" since="34" sdks="1000000:4,33:4"/>
- <field name="EXTRA_WIDTH_IN_PIXELS" since="34" sdks="1000000:4,33:4"/>
- <field name="LOAD_SDK_ALREADY_LOADED" since="34" sdks="1000000:4,33:4"/>
- <field name="LOAD_SDK_INTERNAL_ERROR" since="34" sdks="1000000:4,33:4"/>
- <field name="LOAD_SDK_NOT_FOUND" since="34" sdks="1000000:4,33:4"/>
- <field name="LOAD_SDK_SDK_DEFINED_ERROR" since="34" sdks="1000000:4,33:4"/>
- <field name="LOAD_SDK_SDK_SANDBOX_DISABLED" since="34" sdks="1000000:4,33:4"/>
- <field name="REQUEST_SURFACE_PACKAGE_INTERNAL_ERROR" since="34" sdks="1000000:4,33:4"/>
- <field name="SDK_SANDBOX_PROCESS_NOT_AVAILABLE" since="34" sdks="1000000:4,33:4"/>
- <field name="SDK_SANDBOX_SERVICE" since="34" sdks="1000000:4,33:4"/>
+ <method name="getSyncedSharedPreferencesKeys()Ljava/util/Set;" since="34" sdks="1000000:5"/>
+ <method name="loadSdk(Ljava/lang/String;Landroid/os/Bundle;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V" since="34" sdks="1000000:4"/>
+ <method name="removeSdkSandboxProcessDeathCallback(Landroid/app/sdksandbox/SdkSandboxManager$SdkSandboxProcessDeathCallback;)V" since="34" sdks="1000000:4"/>
+ <method name="removeSyncedSharedPreferencesKeys(Ljava/util/Set;)V" since="34" sdks="1000000:5"/>
+ <method name="requestSurfacePackage(Ljava/lang/String;Landroid/os/Bundle;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V" since="34" sdks="1000000:4"/>
+ <method name="unloadSdk(Ljava/lang/String;)V" since="34" sdks="1000000:4"/>
+ <field name="EXTRA_DISPLAY_ID" since="34" sdks="1000000:4"/>
+ <field name="EXTRA_HEIGHT_IN_PIXELS" since="34" sdks="1000000:4"/>
+ <field name="EXTRA_HOST_TOKEN" since="34" sdks="1000000:4"/>
+ <field name="EXTRA_SURFACE_PACKAGE" since="34" sdks="1000000:4"/>
+ <field name="EXTRA_WIDTH_IN_PIXELS" since="34" sdks="1000000:4"/>
+ <field name="LOAD_SDK_ALREADY_LOADED" since="34" sdks="1000000:4"/>
+ <field name="LOAD_SDK_INTERNAL_ERROR" since="34" sdks="1000000:4"/>
+ <field name="LOAD_SDK_NOT_FOUND" since="34" sdks="1000000:4"/>
+ <field name="LOAD_SDK_SDK_DEFINED_ERROR" since="34" sdks="1000000:4"/>
+ <field name="LOAD_SDK_SDK_SANDBOX_DISABLED" since="34" sdks="1000000:4"/>
+ <field name="REQUEST_SURFACE_PACKAGE_INTERNAL_ERROR" since="34" sdks="1000000:4"/>
+ <field name="REQUEST_SURFACE_PACKAGE_SDK_NOT_LOADED" since="34" sdks="1000000:5"/>
+ <field name="SDK_SANDBOX_PROCESS_NOT_AVAILABLE" since="34" sdks="1000000:4"/>
+ <field name="SDK_SANDBOX_SERVICE" since="34" sdks="1000000:4"/>
<field name="SDK_SANDBOX_STATE_DISABLED"/>
<field name="SDK_SANDBOX_STATE_ENABLED_PROCESS_ISOLATION"/>
</class>
- <class name="android/app/sdksandbox/SdkSandboxManager$SdkSandboxProcessDeathCallback" module="framework-sdksandbox" since="34" sdks="1000000:4,33:4">
+ <class name="android/app/sdksandbox/SdkSandboxManager$SdkSandboxProcessDeathCallback" module="framework-sdksandbox" since="34" sdks="1000000:4">
<extends name="java/lang/Object"/>
<method name="onSdkSandboxDied()V"/>
</class>
+ <class name="android/app/sdksandbox/sdkprovider/SdkSandboxController" module="framework-sdksandbox" since="34" sdks="1000000:5">
+ <extends name="java/lang/Object"/>
+ <method name="getClientSharedPreferences()Landroid/content/SharedPreferences;"/>
+ <method name="getSandboxedSdks()Ljava/util/List;"/>
+ <field name="SDK_SANDBOX_CONTROLLER_SERVICE"/>
+ </class>
<class name="android/app/slice/Slice" since="28">
<extends name="java/lang/Object"/>
<implements name="android/os/Parcelable"/>
@@ -42147,7 +42161,7 @@
<method name="set(Landroid/os/WorkSource;)V"/>
<field name="CREATOR"/>
</class>
- <class name="android/os/ext/SdkExtensions" module="framework-sdkextensions" since="30" sdks="30:2,31:2,33:2,0:30">
+ <class name="android/os/ext/SdkExtensions" since="30">
<extends name="java/lang/Object"/>
<method name="getAllExtensionVersions()Ljava/util/Map;" since="31" sdks="30:2,31:2,33:2,0:31"/>
<method name="getExtensionVersion(I)I"/>
@@ -43839,10 +43853,12 @@
<extends name="java/lang/Object"/>
<field name="DATE_TAKEN_MILLIS"/>
<field name="DURATION_MILLIS"/>
+ <field name="HEIGHT" since="34"/>
<field name="ID"/>
<field name="IS_FAVORITE"/>
<field name="MEDIA_STORE_URI"/>
<field name="MIME_TYPE"/>
+ <field name="ORIENTATION" since="34"/>
<field name="SIZE_BYTES"/>
<field name="STANDARD_MIME_TYPE_EXTENSION"/>
<field name="STANDARD_MIME_TYPE_EXTENSION_ANIMATED_WEBP"/>
@@ -43850,6 +43866,7 @@
<field name="STANDARD_MIME_TYPE_EXTENSION_MOTION_PHOTO"/>
<field name="STANDARD_MIME_TYPE_EXTENSION_NONE"/>
<field name="SYNC_GENERATION"/>
+ <field name="WIDTH" since="34"/>
</class>
<class name="android/provider/Contacts" since="1" deprecated="5">
<extends name="java/lang/Object"/>
@@ -45808,8 +45825,11 @@
<field name="DATE_TAKEN"/>
<field name="DISPLAY_NAME"/>
<field name="DURATION_MILLIS"/>
+ <field name="HEIGHT" since="34" sdks="30:5,31:5,33:5"/>
<field name="MIME_TYPE"/>
+ <field name="ORIENTATION" since="34" sdks="30:5,31:5,33:5"/>
<field name="SIZE"/>
+ <field name="WIDTH" since="34" sdks="30:5,31:5,33:5"/>
</class>
<class name="android/provider/MediaStore$Video" since="1">
<extends name="java/lang/Object"/>
diff --git a/source.properties b/source.properties
index 0ef4e85..e752111 100644
--- a/source.properties
+++ b/source.properties
@@ -2,9 +2,9 @@
Pkg.UserSrc=false
Platform.Version=13
Platform.CodeName=
-Pkg.Revision=2
+Pkg.Revision=1
AndroidVersion.ApiLevel=33
-AndroidVersion.ExtensionLevel=4
+AndroidVersion.ExtensionLevel=5
AndroidVersion.IsBaseSdk=false
Layoutlib.Api=15
Layoutlib.Revision=1