DO NOT MERGE: Drop prebuilt files to android source tree.
The following files have been updated as part of this change:
current/Android.bp
current/snapshot-creation-build-number.txt
current/hiddenapi/annotation-flags.csv
current/hiddenapi/filtered-flags.csv
current/hiddenapi/filtered-stub-flags.csv
current/hiddenapi/index.csv
current/hiddenapi/metadata.csv
current/hiddenapi/signature-patterns.csv
current/licenses/build/soong/licenses/LICENSE
current/sdk_library/system/framework-adservices-removed.txt
current/sdk_library/system/framework-adservices-stubs.jar
current/sdk_library/system/framework-adservices.srcjar
current/sdk_library/system/framework-adservices.txt
current/sdk_library/system/framework-adservices_annotations.zip
current/sdk_library/system/framework-sdksandbox-removed.txt
current/sdk_library/system/framework-sdksandbox-stubs.jar
current/sdk_library/system/framework-sdksandbox.srcjar
current/sdk_library/system/framework-sdksandbox.txt
current/sdk_library/system/framework-sdksandbox_annotations.zip
current/sdk_library/public/framework-adservices-removed.txt
current/sdk_library/public/framework-adservices-stubs.jar
current/sdk_library/public/framework-adservices.srcjar
current/sdk_library/public/framework-adservices.txt
current/sdk_library/public/framework-adservices_annotations.zip
current/sdk_library/public/framework-sdksandbox-removed.txt
current/sdk_library/public/framework-sdksandbox-stubs.jar
current/sdk_library/public/framework-sdksandbox.srcjar
current/sdk_library/public/framework-sdksandbox.txt
current/sdk_library/public/framework-sdksandbox_annotations.zip
current/sdk_library/public/service-adservices-removed.txt
current/sdk_library/public/service-adservices-stubs.jar
current/sdk_library/public/service-adservices.srcjar
current/sdk_library/public/service-adservices.txt
current/sdk_library/public/service-adservices_annotations.zip
current/sdk_library/public/service-sdksandbox-removed.txt
current/sdk_library/public/service-sdksandbox-stubs.jar
current/sdk_library/public/service-sdksandbox.srcjar
current/sdk_library/public/service-sdksandbox.txt
current/sdk_library/public/service-sdksandbox_annotations.zip
current/sdk_library/module-lib/framework-adservices-removed.txt
current/sdk_library/module-lib/framework-adservices-stubs.jar
current/sdk_library/module-lib/framework-adservices.srcjar
current/sdk_library/module-lib/framework-adservices.txt
current/sdk_library/module-lib/framework-adservices_annotations.zip
current/sdk_library/module-lib/framework-sdksandbox-removed.txt
current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
current/sdk_library/module-lib/framework-sdksandbox.srcjar
current/sdk_library/module-lib/framework-sdksandbox.txt
current/sdk_library/module-lib/framework-sdksandbox_annotations.zip
current/sdk_library/system-server/service-adservices-removed.txt
current/sdk_library/system-server/service-adservices-stubs.jar
current/sdk_library/system-server/service-adservices.srcjar
current/sdk_library/system-server/service-adservices.txt
current/sdk_library/system-server/service-adservices_annotations.zip
current/sdk_library/system-server/service-sdksandbox-removed.txt
current/sdk_library/system-server/service-sdksandbox-stubs.jar
current/sdk_library/system-server/service-sdksandbox.srcjar
current/sdk_library/system-server/service-sdksandbox.txt
current/sdk_library/system-server/service-sdksandbox_annotations.zip
Built here: ab/12785903
This build IS suitable for public release.
The change is generated with prebuilt drop tool.
Test: presubmit
Bug: 383543187
Flag: build.RELEASE_APEX_CONTRIBUTIONS_ADSERVICES
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ca0d0d8686f658fc1751ed855d2daa8fce8f9382)
Merged-In: I886004e5e1eec23539783e7f3baf169fd0186c32
Change-Id: I886004e5e1eec23539783e7f3baf169fd0186c32
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index b6f2e99..9a885ff 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,6 +1,6 @@
drops {
android_build_drop {
- build_id: "12750773"
+ build_id: "12785903"
target: "train_build"
source_file: "mainline-sdks/for-latest-build/current/com.google.android.adservices/sdk/adservices-module-sdk-current.zip"
}
diff --git a/current/Android.bp b/current/Android.bp
index e4da94e..e9a4634 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -127,6 +127,7 @@
"com.android.adservices.shared",
"com.android.adservices.service",
"com.android.server.adservices",
+ "com.android.adservices.jarjar.server",
"com.google.errorprone.annotations",
],
public: {
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
index f60a54c..9365a92 100644
--- a/current/hiddenapi/filtered-flags.csv
+++ b/current/hiddenapi/filtered-flags.csv
@@ -1,11 +1,12 @@
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda11;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda13;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda10;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda12;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda14;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda1;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda7;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda9;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda6;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda8;->createService(Landroid/content/Context;)Ljava/lang/Object;,sdk,system-api,test-api
Landroid/adservices/AdServicesState;->isAdServicesStateEnabled()Z,public-api,sdk,system-api,test-api
Landroid/adservices/AdServicesVersion;->API_VERSION:I,removed,unsupported
Landroid/adservices/adid/AdId;-><init>(Ljava/lang/String;Z)V,public-api,sdk,system-api,test-api
@@ -519,16 +520,18 @@
Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$3$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$4$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$4$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$5$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$5$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$6$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$6$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager;->enableAdServices(Landroid/adservices/common/AdServicesStates;Ljava/util/concurrent/Executor;Landroid/adservices/common/AdServicesOutcomeReceiver;)V,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager;->enableAdServices(Landroid/adservices/common/AdServicesStates;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V,sdk,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager;->get(Landroid/content/Context;)Landroid/adservices/common/AdServicesCommonManager;,sdk,system-api,test-api
@@ -1151,6 +1154,7 @@
Landroid/adservices/shell/ShellCommandResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/adservices/shell/ShellCommandResult$1;->newArray(I)[Ljava/lang/Object;,public-api,sdk,system-api,test-api
Landroid/adservices/shell/ShellCommandResult;->describeContents()I,public-api,sdk,system-api,test-api
+Landroid/adservices/shell/ShellCommandResult;->toString()Ljava/lang/String;,core-platform-api,public-api,sdk,system-api,test-api
Landroid/adservices/shell/ShellCommandResult;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/adservices/signals/IProtectedSignalsService$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
Landroid/adservices/signals/IProtectedSignalsService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
@@ -1372,6 +1376,7 @@
Landroid/app/sdksandbox/SharedPreferencesUpdate;->describeContents()I,public-api,sdk,system-api,test-api
Landroid/app/sdksandbox/SharedPreferencesUpdate;->writeToParcel(Landroid/os/Parcel;I)V,public-api,sdk,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
index cc673be..8bda4bd 100644
--- a/current/hiddenapi/filtered-stub-flags.csv
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -1,11 +1,12 @@
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda11;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda13;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda10;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda12;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda14;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda1;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda3;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda5;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda7;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
-Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda9;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda6;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
+Landroid/adservices/AdServicesFrameworkInitializer$$ExternalSyntheticLambda8;->createService(Landroid/content/Context;)Ljava/lang/Object;,system-api,test-api
Landroid/adservices/AdServicesState;->isAdServicesStateEnabled()Z,public-api,system-api,test-api
Landroid/adservices/adid/AdId;-><init>(Ljava/lang/String;Z)V,public-api,system-api,test-api
Landroid/adservices/adid/AdId;->ZERO_OUT:Ljava/lang/String;,public-api,system-api,test-api
@@ -518,16 +519,18 @@
Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda2;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda3;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda4;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda3;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda4;->apply(Ljava/lang/Object;)Ljava/lang/Object;,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda5;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$$ExternalSyntheticLambda6;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$1$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$1$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$2$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$2$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$3$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
-Landroid/adservices/common/AdServicesCommonManager$3$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$4$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager$4$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$5$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$5$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$6$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/adservices/common/AdServicesCommonManager$6$$ExternalSyntheticLambda1;->run()V,core-platform-api,public-api,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager;->enableAdServices(Landroid/adservices/common/AdServicesStates;Ljava/util/concurrent/Executor;Landroid/adservices/common/AdServicesOutcomeReceiver;)V,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager;->enableAdServices(Landroid/adservices/common/AdServicesStates;Ljava/util/concurrent/Executor;Landroid/os/OutcomeReceiver;)V,system-api,test-api
Landroid/adservices/common/AdServicesCommonManager;->get(Landroid/content/Context;)Landroid/adservices/common/AdServicesCommonManager;,system-api,test-api
@@ -1150,6 +1153,7 @@
Landroid/adservices/shell/ShellCommandResult$1;->createFromParcel(Landroid/os/Parcel;)Ljava/lang/Object;,public-api,system-api,test-api
Landroid/adservices/shell/ShellCommandResult$1;->newArray(I)[Ljava/lang/Object;,public-api,system-api,test-api
Landroid/adservices/shell/ShellCommandResult;->describeContents()I,public-api,system-api,test-api
+Landroid/adservices/shell/ShellCommandResult;->toString()Ljava/lang/String;,core-platform-api,public-api,system-api,test-api
Landroid/adservices/shell/ShellCommandResult;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/adservices/signals/IProtectedSignalsService$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
Landroid/adservices/signals/IProtectedSignalsService$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
@@ -1371,6 +1375,7 @@
Landroid/app/sdksandbox/SharedPreferencesUpdate;->describeContents()I,public-api,system-api,test-api
Landroid/app/sdksandbox/SharedPreferencesUpdate;->writeToParcel(Landroid/os/Parcel;I)V,public-api,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda0;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
+Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda10;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda1;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda2;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
Landroid/app/sdksandbox/flags/CustomFeatureFlags$$ExternalSyntheticLambda3;->test(Ljava/lang/Object;)Z,core-platform-api,public-api,system-api,test-api
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 91dbf23..c0779cc 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -6,9 +6,10 @@
Lcom/android/sdksandbox/flags/CustomFeatureFlags;->sdkSandboxDexVerifier()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,49,5,49,25,
Lcom/android/sdksandbox/flags/CustomFeatureFlags;->sdkSandboxInstrumentationInfo()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,56,5,56,25,
Lcom/android/sdksandbox/flags/CustomFeatureFlags;->sdkSandboxUidToAppUidApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,63,5,63,25,
-Lcom/android/sdksandbox/flags/CustomFeatureFlags;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,70,5,70,25,
-Lcom/android/sdksandbox/flags/CustomFeatureFlags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,77,5,77,25,
-Lcom/android/sdksandbox/flags/CustomFeatureFlags;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,84,5,84,25,
+Lcom/android/sdksandbox/flags/CustomFeatureFlags;->sdkSandboxVerifySdkDexFiles()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,70,5,70,25,
+Lcom/android/sdksandbox/flags/CustomFeatureFlags;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,77,5,77,25,
+Lcom/android/sdksandbox/flags/CustomFeatureFlags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,84,5,84,25,
+Lcom/android/sdksandbox/flags/CustomFeatureFlags;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/CustomFeatureFlags.java,91,5,91,25,
Lcom/android/sdksandbox/flags/FeatureFlags;->firstAndLastSdkSandboxUidPublic()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,9,5,9,25,
Lcom/android/sdksandbox/flags/FeatureFlags;->getEffectiveTargetSdkVersionApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,13,5,13,25,
Lcom/android/sdksandbox/flags/FeatureFlags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,17,5,17,25,
@@ -16,9 +17,10 @@
Lcom/android/sdksandbox/flags/FeatureFlags;->sdkSandboxDexVerifier()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,25,5,25,25,
Lcom/android/sdksandbox/flags/FeatureFlags;->sdkSandboxInstrumentationInfo()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,29,5,29,25,
Lcom/android/sdksandbox/flags/FeatureFlags;->sdkSandboxUidToAppUidApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,33,5,33,25,
-Lcom/android/sdksandbox/flags/FeatureFlags;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,37,5,37,25,
-Lcom/android/sdksandbox/flags/FeatureFlags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,41,5,41,25,
-Lcom/android/sdksandbox/flags/FeatureFlags;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,45,5,45,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->sdkSandboxVerifySdkDexFiles()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,37,5,37,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,41,5,41,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,45,5,45,25,
+Lcom/android/sdksandbox/flags/FeatureFlags;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlags.java,49,5,49,25,
Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->firstAndLastSdkSandboxUidPublic()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,8,5,8,25,
Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->getEffectiveTargetSdkVersionApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,15,5,15,25,
Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,22,5,22,25,
@@ -26,16 +28,18 @@
Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sdkSandboxDexVerifier()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,36,5,36,25,
Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sdkSandboxInstrumentationInfo()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,43,5,43,25,
Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sdkSandboxUidToAppUidApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,50,5,50,25,
-Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,57,5,57,25,
-Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,64,5,64,25,
-Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,71,5,71,25,
-Lcom/android/sdksandbox/flags/Flags;->firstAndLastSdkSandboxUidPublic()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,28,5,28,25,
-Lcom/android/sdksandbox/flags/Flags;->getEffectiveTargetSdkVersionApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,34,5,34,25,
-Lcom/android/sdksandbox/flags/Flags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,40,5,40,25,
-Lcom/android/sdksandbox/flags/Flags;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,46,5,46,25,
-Lcom/android/sdksandbox/flags/Flags;->sdkSandboxDexVerifier()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,52,5,52,25,
-Lcom/android/sdksandbox/flags/Flags;->sdkSandboxInstrumentationInfo()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,58,5,58,25,
-Lcom/android/sdksandbox/flags/Flags;->sdkSandboxUidToAppUidApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,64,5,64,25,
-Lcom/android/sdksandbox/flags/Flags;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,70,5,70,25,
-Lcom/android/sdksandbox/flags/Flags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,76,5,76,25,
-Lcom/android/sdksandbox/flags/Flags;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,82,5,82,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->sdkSandboxVerifySdkDexFiles()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,57,5,57,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,64,5,64,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,71,5,71,25,
+Lcom/android/sdksandbox/flags/FeatureFlagsImpl;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/FeatureFlagsImpl.java,78,5,78,25,
+Lcom/android/sdksandbox/flags/Flags;->firstAndLastSdkSandboxUidPublic()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,30,5,30,25,
+Lcom/android/sdksandbox/flags/Flags;->getEffectiveTargetSdkVersionApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,36,5,36,25,
+Lcom/android/sdksandbox/flags/Flags;->sandboxActivitySdkBasedContext()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,42,5,42,25,
+Lcom/android/sdksandbox/flags/Flags;->sandboxClientImportanceListener()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,48,5,48,25,
+Lcom/android/sdksandbox/flags/Flags;->sdkSandboxDexVerifier()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,54,5,54,25,
+Lcom/android/sdksandbox/flags/Flags;->sdkSandboxInstrumentationInfo()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,60,5,60,25,
+Lcom/android/sdksandbox/flags/Flags;->sdkSandboxUidToAppUidApi()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,66,5,66,25,
+Lcom/android/sdksandbox/flags/Flags;->sdkSandboxVerifySdkDexFiles()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,72,5,72,25,
+Lcom/android/sdksandbox/flags/Flags;->selinuxInputSelector()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,78,5,78,25,
+Lcom/android/sdksandbox/flags/Flags;->selinuxSdkSandboxAudit()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,84,5,84,25,
+Lcom/android/sdksandbox/flags/Flags;->serviceRestrictionPackageNameLogicUpdated()Z,out/soong/.intermediates/packages/modules/AdServices/sdksandbox/flags/sdk_sandbox_flags_lib/android_common_apex33/javac/srcjars/com/android/sdksandbox/flags/Flags.java,90,5,90,25,
diff --git a/current/sdk_library/module-lib/framework-adservices-stubs.jar b/current/sdk_library/module-lib/framework-adservices-stubs.jar
index ef19d95..758b402 100644
--- a/current/sdk_library/module-lib/framework-adservices-stubs.jar
+++ b/current/sdk_library/module-lib/framework-adservices-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-adservices.srcjar b/current/sdk_library/module-lib/framework-adservices.srcjar
index 2cf8085..bd5db1b 100644
--- a/current/sdk_library/module-lib/framework-adservices.srcjar
+++ b/current/sdk_library/module-lib/framework-adservices.srcjar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar b/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
index 9345057..fc1baed 100644
--- a/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
+++ b/current/sdk_library/module-lib/framework-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-sdksandbox.srcjar b/current/sdk_library/module-lib/framework-sdksandbox.srcjar
index ec18388..53d9367 100644
--- a/current/sdk_library/module-lib/framework-sdksandbox.srcjar
+++ b/current/sdk_library/module-lib/framework-sdksandbox.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-adservices-stubs.jar b/current/sdk_library/public/framework-adservices-stubs.jar
index a937e06..6568009 100644
--- a/current/sdk_library/public/framework-adservices-stubs.jar
+++ b/current/sdk_library/public/framework-adservices-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-adservices.srcjar b/current/sdk_library/public/framework-adservices.srcjar
index a645330..7c80dd6 100644
--- a/current/sdk_library/public/framework-adservices.srcjar
+++ b/current/sdk_library/public/framework-adservices.srcjar
Binary files differ
diff --git a/current/sdk_library/public/framework-sdksandbox-stubs.jar b/current/sdk_library/public/framework-sdksandbox-stubs.jar
index 0e18ee9..2ef0e24 100644
--- a/current/sdk_library/public/framework-sdksandbox-stubs.jar
+++ b/current/sdk_library/public/framework-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/public/framework-sdksandbox.srcjar b/current/sdk_library/public/framework-sdksandbox.srcjar
index 09df013..34feaf4 100644
--- a/current/sdk_library/public/framework-sdksandbox.srcjar
+++ b/current/sdk_library/public/framework-sdksandbox.srcjar
Binary files differ
diff --git a/current/sdk_library/system-server/service-sdksandbox-stubs.jar b/current/sdk_library/system-server/service-sdksandbox-stubs.jar
index 2b26176..5825ade 100644
--- a/current/sdk_library/system-server/service-sdksandbox-stubs.jar
+++ b/current/sdk_library/system-server/service-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system-server/service-sdksandbox.srcjar b/current/sdk_library/system-server/service-sdksandbox.srcjar
index 11e722e..38f6ce6 100644
--- a/current/sdk_library/system-server/service-sdksandbox.srcjar
+++ b/current/sdk_library/system-server/service-sdksandbox.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-adservices-stubs.jar b/current/sdk_library/system/framework-adservices-stubs.jar
index 13d4484..65ebb77 100644
--- a/current/sdk_library/system/framework-adservices-stubs.jar
+++ b/current/sdk_library/system/framework-adservices-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-adservices.srcjar b/current/sdk_library/system/framework-adservices.srcjar
index a89452e..020f00f 100644
--- a/current/sdk_library/system/framework-adservices.srcjar
+++ b/current/sdk_library/system/framework-adservices.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-sdksandbox-stubs.jar b/current/sdk_library/system/framework-sdksandbox-stubs.jar
index a3c53ff..5cb5eb4 100644
--- a/current/sdk_library/system/framework-sdksandbox-stubs.jar
+++ b/current/sdk_library/system/framework-sdksandbox-stubs.jar
Binary files differ
diff --git a/current/sdk_library/system/framework-sdksandbox.srcjar b/current/sdk_library/system/framework-sdksandbox.srcjar
index 65722ad..aa76547 100644
--- a/current/sdk_library/system/framework-sdksandbox.srcjar
+++ b/current/sdk_library/system/framework-sdksandbox.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
index 3db57c5..eb74625 100644
--- a/current/snapshot-creation-build-number.txt
+++ b/current/snapshot-creation-build-number.txt
@@ -1 +1 @@
-12363824
\ No newline at end of file
+12476646
\ No newline at end of file
