Snap for 7915578 from 61e0d554a7e50b22b36f4025079c524d657157cb to mainline-sdkext-releaseandroid-mainline-12.0.0_r81android-mainline-12.0.0_r109aml_sdk_311710000android12-mainline-sdkext-release

Change-Id: I56e01dbf7f2fa678516b22fa4b775f9a463200e5

4 files changed, 209 insertions, 2 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index 313eb7f..484e599 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: "7548924"
+    build_id: "7653768"
     target: "mainline_modules-user"
     source_file: "mainline-sdks/tethering-module-sdk-current.zip"
   }
@@ -11,6 +11,9 @@ drops {
   git_branch: "sc-dev"
   transform: TRANSFORM_UNZIP
   transform_options {
-    exclude: "Android.bp"
+    rename {
+      from_path: "Android.bp"
+      to_path: "Android.bp.auto"
+    }
   }
 }
diff --git a/OWNERS b/OWNERS
index 8b6675a..b4de908 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1 +1,3 @@
 include platform/packages/modules/common:/OWNERS
+
+include platform/packages/modules/common:/PREBUILTS_MODULE_OWNERS
diff --git a/current/Android.bp b/current/Android.bp
index aa01c93..c8ecddf 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -55,6 +55,7 @@ java_sdk_library_import {
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
     shared_library: false,
+    permitted_packages: ["android.net"],
     public: {
         jars: ["sdk_library/public/framework-connectivity-stubs.jar"],
         stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
@@ -85,6 +86,7 @@ java_sdk_library_import {
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
     shared_library: false,
+    permitted_packages: ["android.net"],
     public: {
         jars: ["sdk_library/public/framework-connectivity-stubs.jar"],
         stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
@@ -115,6 +117,7 @@ java_sdk_library_import {
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
     shared_library: false,
+    permitted_packages: ["android.net"],
     public: {
         jars: ["sdk_library/public/framework-tethering-stubs.jar"],
         stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
@@ -145,6 +148,7 @@ java_sdk_library_import {
     apex_available: ["com.android.tethering"],
     licenses: ["tethering-module-sdk_Android-Apache-2.0"],
     shared_library: false,
+    permitted_packages: ["android.net"],
     public: {
         jars: ["sdk_library/public/framework-tethering-stubs.jar"],
         stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..c8ecddf
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,198 @@
+// 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: "tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current",
+    sdk_member_name: "com.android.tethering-bootclasspath-fragment",
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
+    contents: [
+        "tethering-module-sdk_framework-connectivity@current",
+        "tethering-module-sdk_framework-tethering@current",
+    ],
+    hidden_api: {
+        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+        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.tethering-bootclasspath-fragment",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    contents: [
+        "framework-connectivity",
+        "framework-tethering",
+    ],
+    hidden_api: {
+        unsupported: ["hiddenapi/hiddenapi-unsupported.txt"],
+        max_target_o_low_priority: ["hiddenapi/hiddenapi-max-target-o-low-priority.txt"],
+        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: "tethering-module-sdk_framework-connectivity@current",
+    sdk_member_name: "framework-connectivity",
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
+    shared_library: false,
+    permitted_packages: ["android.net"],
+    public: {
+        jars: ["sdk_library/public/framework-connectivity-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
+        current_api: "sdk_library/public/framework-connectivity.txt",
+        removed_api: "sdk_library/public/framework-connectivity-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-connectivity-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"],
+        current_api: "sdk_library/system/framework-connectivity.txt",
+        removed_api: "sdk_library/system/framework-connectivity-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-connectivity-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"],
+        current_api: "sdk_library/module-lib/framework-connectivity.txt",
+        removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "framework-connectivity",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    shared_library: false,
+    permitted_packages: ["android.net"],
+    public: {
+        jars: ["sdk_library/public/framework-connectivity-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-connectivity.srcjar"],
+        current_api: "sdk_library/public/framework-connectivity.txt",
+        removed_api: "sdk_library/public/framework-connectivity-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-connectivity-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-connectivity.srcjar"],
+        current_api: "sdk_library/system/framework-connectivity.txt",
+        removed_api: "sdk_library/system/framework-connectivity-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-connectivity-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-connectivity.srcjar"],
+        current_api: "sdk_library/module-lib/framework-connectivity.txt",
+        removed_api: "sdk_library/module-lib/framework-connectivity-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "tethering-module-sdk_framework-tethering@current",
+    sdk_member_name: "framework-tethering",
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0@current"],
+    shared_library: false,
+    permitted_packages: ["android.net"],
+    public: {
+        jars: ["sdk_library/public/framework-tethering-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
+        current_api: "sdk_library/public/framework-tethering.txt",
+        removed_api: "sdk_library/public/framework-tethering-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-tethering-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-tethering.srcjar"],
+        current_api: "sdk_library/system/framework-tethering.txt",
+        removed_api: "sdk_library/system/framework-tethering-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-tethering-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"],
+        current_api: "sdk_library/module-lib/framework-tethering.txt",
+        removed_api: "sdk_library/module-lib/framework-tethering-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+java_sdk_library_import {
+    name: "framework-tethering",
+    prefer: false,
+    visibility: ["//visibility:public"],
+    apex_available: ["com.android.tethering"],
+    licenses: ["tethering-module-sdk_Android-Apache-2.0"],
+    shared_library: false,
+    permitted_packages: ["android.net"],
+    public: {
+        jars: ["sdk_library/public/framework-tethering-stubs.jar"],
+        stub_srcs: ["sdk_library/public/framework-tethering.srcjar"],
+        current_api: "sdk_library/public/framework-tethering.txt",
+        removed_api: "sdk_library/public/framework-tethering-removed.txt",
+        sdk_version: "module_current",
+    },
+    system: {
+        jars: ["sdk_library/system/framework-tethering-stubs.jar"],
+        stub_srcs: ["sdk_library/system/framework-tethering.srcjar"],
+        current_api: "sdk_library/system/framework-tethering.txt",
+        removed_api: "sdk_library/system/framework-tethering-removed.txt",
+        sdk_version: "module_current",
+    },
+    module_lib: {
+        jars: ["sdk_library/module-lib/framework-tethering-stubs.jar"],
+        stub_srcs: ["sdk_library/module-lib/framework-tethering.srcjar"],
+        current_api: "sdk_library/module-lib/framework-tethering.txt",
+        removed_api: "sdk_library/module-lib/framework-tethering-removed.txt",
+        sdk_version: "module_current",
+    },
+}
+
+license {
+    name: "tethering-module-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: "tethering-module-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: "tethering-module-sdk@current",
+    visibility: ["//visibility:public"],
+    bootclasspath_fragments: ["tethering-module-sdk_com.android.tethering-bootclasspath-fragment@current"],
+    java_sdk_libs: [
+        "tethering-module-sdk_framework-connectivity@current",
+        "tethering-module-sdk_framework-tethering@current",
+    ],
+}