diff options
author | Xin Li <delphij@google.com> | 2023-01-11 22:47:35 -0800 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2023-01-11 22:47:35 -0800 |
commit | 432953a076f02f1d4d3e6ce55c990cc875cb0457 (patch) | |
tree | 2d226c37b00fac8db0b22377c3b0cb46a4241d7e | |
parent | 0ce306bf449ca71d696528332b63c7b5b24e4963 (diff) | |
parent | f33c47f08db33f223ebd089d30a323e6a859b654 (diff) | |
download | MediaProvider-432953a076f02f1d4d3e6ce55c990cc875cb0457.tar.gz |
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Ifd83cdd42e95e538609d1fede42eb20dea0c9382
Change-Id: I28335d43d2ad2d348b7832cab7593960426b8ecf
-rw-r--r-- | .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 2 | ||||
-rw-r--r-- | current/hiddenapi/index.csv | 10 | ||||
-rw-r--r-- | current/snapshot-creation-build-number.txt | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index bcb0005..c7b8dab 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: "T1005032" + build_id: "T1004707" target: "train_build" source_file: "mainline-sdks/for-Tiramisu-build/current/com.google.android.mediaprovider/sdk/mediaprovider-module-sdk-current.zip" } diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv index 233e7e0..e8c0a69 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,1959,13,1959,96,maxTargetSdk=30&trackingBug=170729553L -Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1968,13,1968,33, -Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1921,9,1921,29, -Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1927,9,1927,29, -Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1933,9,1933,29, +Landroid/provider/MediaStore$Files$FileColumns;->STORAGE_ID:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1955,13,1955,96,maxTargetSdk=30&trackingBug=170729553L +Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1964,13,1964,33, +Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1917,9,1917,29, +Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1923,9,1923,29, +Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1929,9,1929,29, diff --git a/current/snapshot-creation-build-number.txt b/current/snapshot-creation-build-number.txt index 517428b..e3a6312 100644 --- a/current/snapshot-creation-build-number.txt +++ b/current/snapshot-creation-build-number.txt @@ -1 +1 @@ -9111734
\ No newline at end of file +8975653
\ No newline at end of file |