Snap for 8610053 from dfde1def53d94ad6e0a198750874da8bd892fbdc to tm-frc-scheduling-release
Change-Id: I3cb4d2707e802bf1fb73422a5773406640df91c7
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index ab66575..574c781 100644
--- a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
@@ -1,13 +1,15 @@
drops {
android_build_drop {
- build_id: "7542407"
- target: "mainline_modules-user"
- source_file: "mainline-sdks/scheduling-sdk-current.zip"
+ build_id: "T1003987"
+ target: "train_build"
+ source_file: "mainline-sdks/for-latest-build/current/com.google.android.scheduling/sdk/scheduling-sdk-current.zip"
}
dest_file: "current/current.zip"
version: ""
version_group: ""
git_project: "platform/prebuilts/module_sdk/Scheduling"
- git_branch: "sc-dev"
+ git_branch: "tm-dev"
transform: TRANSFORM_UNZIP
+ transform_options {
+ }
}
diff --git a/current/Android.bp b/current/Android.bp
index 2338ce2..4138fa1 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -1,19 +1,22 @@
// This is auto-generated. DO NOT EDIT.
+// Soong config variable stanza added by vendor/google/build/mainline_modules_sdks.py.
+soong_config_module_type_import {
+ from: "packages/modules/common/Android.bp",
+ module_types: [
+ "module_java_import",
+ "module_java_sdk_library_import",
+ "module_prebuilt_bootclasspath_fragment",
+ "module_prebuilt_systemserverclasspath_fragment",
+ ],
+}
+
package {
// A default list here prevents the license LSC from adding its own list which would
// be unnecessary as every module in the sdk already has its own licenses property.
default_applicable_licenses: ["Android-Apache-2.0"],
}
-soong_config_module_type_import {
- from: "packages/modules/common/Android.bp",
- module_types: [
- "module_java_sdk_library_import",
- "module_prebuilt_bootclasspath_fragment",
- ],
-}
-
prebuilt_bootclasspath_fragment {
name: "scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current",
sdk_member_name: "com.android.scheduling-bootclasspath-fragment",
@@ -21,18 +24,26 @@
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
contents: ["scheduling-sdk_framework-scheduling@current"],
+ fragments: [
+ {
+ apex: "com.android.art",
+ module: "art-bootclasspath-fragment",
+ },
+ ],
hidden_api: {
- stub_flags: "hiddenapi/stub-flags.csv",
annotation_flags: "hiddenapi/annotation-flags.csv",
metadata: "hiddenapi/metadata.csv",
index: "hiddenapi/index.csv",
- all_flags: "hiddenapi/all-flags.csv",
+ signature_patterns: "hiddenapi/signature-patterns.csv",
+ filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
+ filtered_flags: "hiddenapi/filtered-flags.csv",
},
}
module_prebuilt_bootclasspath_fragment {
name: "com.android.scheduling-bootclasspath-fragment",
- prefer: false,
+ // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -42,12 +53,19 @@
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
contents: ["framework-scheduling"],
+ fragments: [
+ {
+ apex: "com.android.art",
+ module: "art-bootclasspath-fragment",
+ },
+ ],
hidden_api: {
- stub_flags: "hiddenapi/stub-flags.csv",
annotation_flags: "hiddenapi/annotation-flags.csv",
metadata: "hiddenapi/metadata.csv",
index: "hiddenapi/index.csv",
- all_flags: "hiddenapi/all-flags.csv",
+ signature_patterns: "hiddenapi/signature-patterns.csv",
+ filtered_stub_flags: "hiddenapi/filtered-stub-flags.csv",
+ filtered_flags: "hiddenapi/filtered-flags.csv",
},
}
@@ -58,6 +76,7 @@
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
shared_library: false,
+ permitted_packages: ["android.scheduling"],
public: {
jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-scheduling.srcjar"],
@@ -86,7 +105,8 @@
module_java_sdk_library_import {
name: "framework-scheduling",
- prefer: false,
+ // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ prefer: true,
soong_config_variables: {
module_build_from_source: {
prefer: false,
@@ -96,6 +116,7 @@
apex_available: ["com.android.scheduling"],
licenses: ["scheduling-sdk_Android-Apache-2.0"],
shared_library: false,
+ permitted_packages: ["android.scheduling"],
public: {
jars: ["sdk_library/public/framework-scheduling-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-scheduling.srcjar"],
@@ -122,6 +143,30 @@
},
}
+java_import {
+ name: "scheduling-sdk_service-scheduling@current",
+ sdk_member_name: "service-scheduling",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
+ jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar"],
+}
+
+module_java_import {
+ name: "service-scheduling",
+ // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ prefer: true,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0"],
+ jars: ["java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar"],
+}
+
license {
name: "scheduling-sdk_Android-Apache-2.0@current",
sdk_member_name: "Android-Apache-2.0",
@@ -137,9 +182,35 @@
license_text: ["licenses/build/soong/licenses/LICENSE"],
}
+prebuilt_systemserverclasspath_fragment {
+ name: "scheduling-sdk_com.android.scheduling-systemserverclasspath-fragment@current",
+ sdk_member_name: "com.android.scheduling-systemserverclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0@current"],
+ standalone_contents: ["scheduling-sdk_service-scheduling@current"],
+}
+
+module_prebuilt_systemserverclasspath_fragment {
+ name: "com.android.scheduling-systemserverclasspath-fragment",
+ // Do not prefer prebuilt if the Soong config variable "module_build_from_source" in namespace "ANDROID" is true.
+ prefer: true,
+ soong_config_variables: {
+ module_build_from_source: {
+ prefer: false,
+ },
+ },
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.scheduling"],
+ licenses: ["scheduling-sdk_Android-Apache-2.0"],
+ standalone_contents: ["service-scheduling"],
+}
+
sdk_snapshot {
name: "scheduling-sdk@current",
visibility: ["//visibility:public"],
bootclasspath_fragments: ["scheduling-sdk_com.android.scheduling-bootclasspath-fragment@current"],
java_sdk_libs: ["scheduling-sdk_framework-scheduling@current"],
+ java_systemserver_libs: ["scheduling-sdk_service-scheduling@current"],
+ systemserverclasspath_fragments: ["scheduling-sdk_com.android.scheduling-systemserverclasspath-fragment@current"],
}
diff --git a/current/hiddenapi/filtered-flags.csv b/current/hiddenapi/filtered-flags.csv
new file mode 100644
index 0000000..f55fca9
--- /dev/null
+++ b/current/hiddenapi/filtered-flags.csv
@@ -0,0 +1,22 @@
+Landroid/scheduling/IRebootReadinessManager$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRebootReadinessManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRebootReadinessManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRebootReadinessManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Default;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,sdk,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;-><init>(ZJLjava/lang/String;)V,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;->getEstimatedFinishTime()J,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;->getLogSubsystemName()Ljava/lang/String;,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;->isReadyToReboot()Z,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RequestRebootReadinessStatusListener;->onRequestRebootReadinessStatus()Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->ACTION_REBOOT_READY:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->EXTRA_IS_READY_TO_REBOOT:Ljava/lang/String;,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->addRequestRebootReadinessStatusListener(Ljava/util/concurrent/Executor;Landroid/scheduling/RebootReadinessManager$RequestRebootReadinessStatusListener;)V,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->cancelPendingReboot()V,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->isReadyToReboot()Z,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->markRebootPending()V,sdk,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->removeRequestRebootReadinessStatusListener(Landroid/scheduling/RebootReadinessManager$RequestRebootReadinessStatusListener;)V,sdk,system-api,test-api
+Landroid/scheduling/SchedulingFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,sdk,system-api,test-api
diff --git a/current/hiddenapi/filtered-stub-flags.csv b/current/hiddenapi/filtered-stub-flags.csv
new file mode 100644
index 0000000..54f764e
--- /dev/null
+++ b/current/hiddenapi/filtered-stub-flags.csv
@@ -0,0 +1,22 @@
+Landroid/scheduling/IRebootReadinessManager$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/scheduling/IRebootReadinessManager$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/scheduling/IRebootReadinessManager$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/scheduling/IRebootReadinessManager$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Default;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Stub$Proxy;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Stub;->asBinder()Landroid/os/IBinder;,public-api,system-api,test-api
+Landroid/scheduling/IRequestRebootReadinessStatusListener$Stub;->onTransact(ILandroid/os/Parcel;Landroid/os/Parcel;I)Z,public-api,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessCallbackProxy$$ExternalSyntheticLambda0;->run()V,core-platform-api,public-api,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;-><init>(ZJLjava/lang/String;)V,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;->getEstimatedFinishTime()J,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;->getLogSubsystemName()Ljava/lang/String;,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;->isReadyToReboot()Z,system-api,test-api
+Landroid/scheduling/RebootReadinessManager$RequestRebootReadinessStatusListener;->onRequestRebootReadinessStatus()Landroid/scheduling/RebootReadinessManager$RebootReadinessStatus;,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->ACTION_REBOOT_READY:Ljava/lang/String;,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->EXTRA_IS_READY_TO_REBOOT:Ljava/lang/String;,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->addRequestRebootReadinessStatusListener(Ljava/util/concurrent/Executor;Landroid/scheduling/RebootReadinessManager$RequestRebootReadinessStatusListener;)V,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->cancelPendingReboot()V,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->isReadyToReboot()Z,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->markRebootPending()V,system-api,test-api
+Landroid/scheduling/RebootReadinessManager;->removeRequestRebootReadinessStatusListener(Landroid/scheduling/RebootReadinessManager$RequestRebootReadinessStatusListener;)V,system-api,test-api
+Landroid/scheduling/SchedulingFrameworkInitializer$$ExternalSyntheticLambda0;->createService(Landroid/content/Context;Landroid/os/IBinder;)Ljava/lang/Object;,system-api,test-api
diff --git a/current/hiddenapi/signature-patterns.csv b/current/hiddenapi/signature-patterns.csv
new file mode 100644
index 0000000..65648c9
--- /dev/null
+++ b/current/hiddenapi/signature-patterns.csv
@@ -0,0 +1 @@
+android/scheduling/**
diff --git a/current/java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar b/current/java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/current/java_systemserver_libs/snapshot/jars/are/invalid/service-scheduling.jar
diff --git a/current/licenses/build/soong/licenses/LICENSE b/current/licenses/build/soong/licenses/LICENSE
index dae0406..d645695 100644
--- a/current/licenses/build/soong/licenses/LICENSE
+++ b/current/licenses/build/soong/licenses/LICENSE
@@ -1,16 +1,4 @@
- Copyright (c) The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
diff --git a/current/sdk_library/module-lib/framework-scheduling.srcjar b/current/sdk_library/module-lib/framework-scheduling.srcjar
index 14858f9..7462a35 100644
--- a/current/sdk_library/module-lib/framework-scheduling.srcjar
+++ b/current/sdk_library/module-lib/framework-scheduling.srcjar
Binary files differ
diff --git a/current/sdk_library/system/framework-scheduling.srcjar b/current/sdk_library/system/framework-scheduling.srcjar
index 812c497..28b9085 100644
--- a/current/sdk_library/system/framework-scheduling.srcjar
+++ b/current/sdk_library/system/framework-scheduling.srcjar
Binary files differ
diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt
new file mode 100644
index 0000000..120d4bd
--- /dev/null
+++ b/current/snapshot-creation-build-number.txt
@@ -0,0 +1 @@
+8559472
\ No newline at end of file
