Snap for 7679530 from 40f81b12 to mainline-extservices-release

Change-Id: I566e1433c7bc444a77a88ef201259bebf730eece

.prebuilt_info/prebuilt_info_current_current_zip.asciipb

 drops {
   android_build_drop {
-    build_id: "7502739"
+    build_id: "7624795"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/sdkextensions-sdk-current.zip"
   }
@@ -10,4 +10,10 @@ drops {
   git_project: "platform/prebuilts/module_sdk/SdkExtensions"
   git_branch: "sc-dev"
   transform: TRANSFORM_UNZIP
+  transform_options {
+    rename {
+      from_path: "Android.bp"
+      to_path: "Android.bp.auto"
+    }
+  }
 }

1/hiddenapi/all-flags.csv

@@ -7,5 +7,7 @@ Landroid/os/ext/SdkExtensions;->VERSION_CODE_S:I,blocked
 Landroid/os/ext/SdkExtensions;->getAllExtensionVersions()Ljava/util/Map;,sdk,system-api,test-api
 Landroid/os/ext/SdkExtensions;->getExtensionVersion(I)I,sdk,system-api,test-api
 Landroid/os/ext/util/SdkLevel;-><init>()V,blocked
+Landroid/os/ext/util/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z,blocked
 Landroid/os/ext/util/SdkLevel;->isAtLeastR()Z,blocked
 Landroid/os/ext/util/SdkLevel;->isAtLeastS()Z,blocked
+Landroid/os/ext/util/SdkLevel;->isAtLeastT()Z,blocked

1/hiddenapi/index.csv

-signature,file,startline,startcol,endline,endcol,properties
+

1/hiddenapi/stub-flags.csv

@@ -7,5 +7,7 @@ Landroid/os/ext/SdkExtensions;->VERSION_CODE_S:I
 Landroid/os/ext/SdkExtensions;->getAllExtensionVersions()Ljava/util/Map;,system-api,test-api
 Landroid/os/ext/SdkExtensions;->getExtensionVersion(I)I,system-api,test-api
 Landroid/os/ext/util/SdkLevel;-><init>()V
+Landroid/os/ext/util/SdkLevel;->isAtLeastPreReleaseCodename(Ljava/lang/String;)Z
 Landroid/os/ext/util/SdkLevel;->isAtLeastR()Z
 Landroid/os/ext/util/SdkLevel;->isAtLeastS()Z
+Landroid/os/ext/util/SdkLevel;->isAtLeastT()Z

OWNERS

 include platform/packages/modules/common:/OWNERS
+
+include platform/packages/modules/common:/PREBUILTS_MODULE_OWNERS

current/Android.bp

@@ -48,6 +48,7 @@ java_sdk_library_import {
     ],
     licenses: ["sdkextensions-sdk_Android-Apache-2.0@current"],
     shared_library: false,
+    permitted_packages: ["android.os.ext"],
     public: {
         jars: ["sdk_library/public/framework-sdkextensions-stubs.jar"],
         stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],
@@ -81,6 +82,7 @@ java_sdk_library_import {
     ],
     licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
     shared_library: false,
+    permitted_packages: ["android.os.ext"],
     public: {
         jars: ["sdk_library/public/framework-sdkextensions-stubs.jar"],
         stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],

current/Android.bp.auto

+// This is auto-generated. DO NOT EDIT.
+
+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"],
+}
+
+prebuilt_bootclasspath_fragment {
+    name: "sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current",
+    sdk_member_name: "com.android.sdkext-bootclasspath-fragment",
+    visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
+    apex_available: ["com.android.sdkext"],
+    licenses: ["sdkextensions-sdk_Android-Apache-2.0@current"],
+    contents: ["sdkextensions-sdk_framework-sdkextensions@current"],
+    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",
+    },
+}
+
+prebuilt_bootclasspath_fragment {
+    name: "com.android.sdkext-bootclasspath-fragment",
+    prefer: false,
+    visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
+    apex_available: ["com.android.sdkext"],
+    licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
+    contents: ["framework-sdkextensions"],
+    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",
+    },
+}
+
+java_sdk_library_import {
+    name: "sdkextensions-sdk_framework-sdkextensions@current",
+    sdk_member_name: "framework-sdkextensions",
+    visibility: ["//visibility:public"],
+    apex_available: [
+        "com.android.sdkext",
+        "test_com.android.sdkext",
+    ],
+    licenses: ["sdkextensions-sdk_Android-Apache-2.0@current"],
+    shared_library: false,
+    permitted_packages: ["android.os.ext"],
+    public: {
+        jars: ["sdk_library/public/framework-sdkextensions-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],
+        current_api: "sdk_library/public/framework-sdkextensions.txt",
+        removed_api: "sdk_library/public/framework-sdkextensions-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-sdkextensions-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-sdkextensions.srcjar"],
+        current_api: "sdk_library/system/framework-sdkextensions.txt",
+        removed_api: "sdk_library/system/framework-sdkextensions-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-sdkextensions-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-sdkextensions.srcjar"],
+        current_api: "sdk_library/module-lib/framework-sdkextensions.txt",
+        removed_api: "sdk_library/module-lib/framework-sdkextensions-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "framework-sdkextensions",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: [
+        "com.android.sdkext",
+        "test_com.android.sdkext",
+    ],
+    licenses: ["sdkextensions-sdk_Android-Apache-2.0"],
+    shared_library: false,
+    permitted_packages: ["android.os.ext"],
+    public: {
+        jars: ["sdk_library/public/framework-sdkextensions-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-sdkextensions.srcjar"],
+        current_api: "sdk_library/public/framework-sdkextensions.txt",
+        removed_api: "sdk_library/public/framework-sdkextensions-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-sdkextensions-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-sdkextensions.srcjar"],
+        current_api: "sdk_library/system/framework-sdkextensions.txt",
+        removed_api: "sdk_library/system/framework-sdkextensions-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-sdkextensions-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-sdkextensions.srcjar"],
+        current_api: "sdk_library/module-lib/framework-sdkextensions.txt",
+        removed_api: "sdk_library/module-lib/framework-sdkextensions-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+license {
+    name: "sdkextensions-sdk_Android-Apache-2.0@current",
+    sdk_member_name: "Android-Apache-2.0",
+    visibility: ["//visibility:private"],
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+license {
+    name: "sdkextensions-sdk_Android-Apache-2.0",
+    visibility: ["//visibility:private"],
+    license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+    license_text: ["licenses/build/soong/licenses/LICENSE"],
+}
+
+sdk_snapshot {
+    name: "sdkextensions-sdk@current",
+    visibility: ["//packages/modules/SdkExtensions:__subpackages__"],
+    bootclasspath_fragments: ["sdkextensions-sdk_com.android.sdkext-bootclasspath-fragment@current"],
+    java_sdk_libs: ["sdkextensions-sdk_framework-sdkextensions@current"],
+}