Snap for 7652338 from 28166edd6ef9e7ac5ea36aadfe9219ea6c9c5579 to mainline-cellbroadcast-release
Change-Id: Ia810bc132e57885b9f7e6cb6b19a96579d321a9c
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb
index a82e1e7..43120c5 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: "7639396"
target: "mainline_modules-user"
source_file: "mainline-sdks/mediaprovider-module-sdk-current.zip"
}
@@ -11,6 +11,9 @@
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 77c0731..f29582c 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -50,6 +50,7 @@
],
licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license@current"],
shared_library: false,
+ permitted_packages: ["android.provider"],
public: {
jars: ["sdk_library/public/framework-mediaprovider-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
@@ -83,6 +84,7 @@
],
licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
shared_library: false,
+ permitted_packages: ["android.provider"],
public: {
jars: ["sdk_library/public/framework-mediaprovider-stubs.jar"],
stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
diff --git a/current/Android.bp.auto b/current/Android.bp.auto
new file mode 100755
index 0000000..f29582c
--- /dev/null
+++ b/current/Android.bp.auto
@@ -0,0 +1,131 @@
+// 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: "mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current",
+ sdk_member_name: "com.android.mediaprovider-bootclasspath-fragment",
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.mediaprovider"],
+ licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license@current"],
+ contents: ["mediaprovider-module-sdk_framework-mediaprovider@current"],
+ hidden_api: {
+ 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.mediaprovider-bootclasspath-fragment",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: ["com.android.mediaprovider"],
+ licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
+ contents: ["framework-mediaprovider"],
+ hidden_api: {
+ 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: "mediaprovider-module-sdk_framework-mediaprovider@current",
+ sdk_member_name: "framework-mediaprovider",
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.mediaprovider",
+ "test_com.android.mediaprovider",
+ ],
+ licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license@current"],
+ shared_library: false,
+ permitted_packages: ["android.provider"],
+ public: {
+ jars: ["sdk_library/public/framework-mediaprovider-stubs.jar"],
+ stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
+ current_api: "sdk_library/public/framework-mediaprovider.txt",
+ removed_api: "sdk_library/public/framework-mediaprovider-removed.txt",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-mediaprovider-stubs.jar"],
+ stub_srcs: ["sdk_library/system/framework-mediaprovider.srcjar"],
+ current_api: "sdk_library/system/framework-mediaprovider.txt",
+ removed_api: "sdk_library/system/framework-mediaprovider-removed.txt",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-mediaprovider-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/framework-mediaprovider.srcjar"],
+ current_api: "sdk_library/module-lib/framework-mediaprovider.txt",
+ removed_api: "sdk_library/module-lib/framework-mediaprovider-removed.txt",
+ sdk_version: "module_current",
+ },
+}
+
+java_sdk_library_import {
+ name: "framework-mediaprovider",
+ prefer: false,
+ visibility: ["//visibility:public"],
+ apex_available: [
+ "com.android.mediaprovider",
+ "test_com.android.mediaprovider",
+ ],
+ licenses: ["mediaprovider-module-sdk_packages_providers_MediaProvider_license"],
+ shared_library: false,
+ permitted_packages: ["android.provider"],
+ public: {
+ jars: ["sdk_library/public/framework-mediaprovider-stubs.jar"],
+ stub_srcs: ["sdk_library/public/framework-mediaprovider.srcjar"],
+ current_api: "sdk_library/public/framework-mediaprovider.txt",
+ removed_api: "sdk_library/public/framework-mediaprovider-removed.txt",
+ sdk_version: "module_current",
+ },
+ system: {
+ jars: ["sdk_library/system/framework-mediaprovider-stubs.jar"],
+ stub_srcs: ["sdk_library/system/framework-mediaprovider.srcjar"],
+ current_api: "sdk_library/system/framework-mediaprovider.txt",
+ removed_api: "sdk_library/system/framework-mediaprovider-removed.txt",
+ sdk_version: "module_current",
+ },
+ module_lib: {
+ jars: ["sdk_library/module-lib/framework-mediaprovider-stubs.jar"],
+ stub_srcs: ["sdk_library/module-lib/framework-mediaprovider.srcjar"],
+ current_api: "sdk_library/module-lib/framework-mediaprovider.txt",
+ removed_api: "sdk_library/module-lib/framework-mediaprovider-removed.txt",
+ sdk_version: "module_current",
+ },
+}
+
+license {
+ name: "mediaprovider-module-sdk_packages_providers_MediaProvider_license@current",
+ sdk_member_name: "packages_providers_MediaProvider_license",
+ visibility: ["//visibility:private"],
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["licenses/packages/providers/MediaProvider/NOTICE"],
+}
+
+license {
+ name: "mediaprovider-module-sdk_packages_providers_MediaProvider_license",
+ visibility: ["//visibility:private"],
+ license_kinds: ["SPDX-license-identifier-Apache-2.0"],
+ license_text: ["licenses/packages/providers/MediaProvider/NOTICE"],
+}
+
+sdk_snapshot {
+ name: "mediaprovider-module-sdk@current",
+ visibility: ["//visibility:public"],
+ bootclasspath_fragments: ["mediaprovider-module-sdk_com.android.mediaprovider-bootclasspath-fragment@current"],
+ java_sdk_libs: ["mediaprovider-module-sdk_framework-mediaprovider@current"],
+}
diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv
index 8ab6a64..e80d172 100644
--- a/current/hiddenapi/all-flags.csv
+++ b/current/hiddenapi/all-flags.csv
@@ -374,7 +374,6 @@
Landroid/provider/MediaStore;->GET_DOCUMENT_URI_CALL:Ljava/lang/String;,blocked
Landroid/provider/MediaStore;->GET_GENERATION_CALL:Ljava/lang/String;,blocked
Landroid/provider/MediaStore;->GET_MEDIA_URI_CALL:Ljava/lang/String;,blocked
-Landroid/provider/MediaStore;->GET_ORIGINAL_MEDIA_FORMAT_FILE_DESCRIPTOR_CALL:Ljava/lang/String;,blocked
Landroid/provider/MediaStore;->GET_REDACTED_MEDIA_URI_CALL:Ljava/lang/String;,blocked
Landroid/provider/MediaStore;->GET_REDACTED_MEDIA_URI_LIST_CALL:Ljava/lang/String;,blocked
Landroid/provider/MediaStore;->GET_VERSION_CALL:Ljava/lang/String;,blocked
diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv
index 07736f5..28be2ec 100644
--- a/current/hiddenapi/index.csv
+++ b/current/hiddenapi/index.csv
@@ -1,6 +1,6 @@
signature,file,startline,startcol,endline,endcol,properties
-Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1780,13,1780,96,maxTargetSdk=30&trackingBug=170729553L
-Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1789,13,1789,33,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1742,9,1742,29,
-Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1748,9,1748,29,
-Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1754,9,1754,29,
+Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1766,13,1766,96,maxTargetSdk=30&trackingBug=170729553L
+Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1775,13,1775,33,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1728,9,1728,29,
+Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1734,9,1734,29,
+Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1740,9,1740,29,
diff --git a/current/hiddenapi/stub-flags.csv b/current/hiddenapi/stub-flags.csv
index d80247d..6fb3bd6 100644
--- a/current/hiddenapi/stub-flags.csv
+++ b/current/hiddenapi/stub-flags.csv
@@ -374,7 +374,6 @@
Landroid/provider/MediaStore;->GET_DOCUMENT_URI_CALL:Ljava/lang/String;
Landroid/provider/MediaStore;->GET_GENERATION_CALL:Ljava/lang/String;
Landroid/provider/MediaStore;->GET_MEDIA_URI_CALL:Ljava/lang/String;
-Landroid/provider/MediaStore;->GET_ORIGINAL_MEDIA_FORMAT_FILE_DESCRIPTOR_CALL:Ljava/lang/String;
Landroid/provider/MediaStore;->GET_REDACTED_MEDIA_URI_CALL:Ljava/lang/String;
Landroid/provider/MediaStore;->GET_REDACTED_MEDIA_URI_LIST_CALL:Ljava/lang/String;
Landroid/provider/MediaStore;->GET_VERSION_CALL:Ljava/lang/String;
