diff options
author | Xin Li <delphij@google.com> | 2022-02-14 20:06:45 +0000 |
---|---|---|
committer | Xin Li <delphij@google.com> | 2022-02-14 20:06:45 +0000 |
commit | b2a44a3dca81398e47ec5d88cced4fb9465237eb (patch) | |
tree | 0177281194c8619b8654f6832524588b52e6d2ba | |
parent | 62744e041f30bb3ac0b2ab9b4eb82c39856dc326 (diff) | |
parent | 5f6d711189f5b87592a1814633806c7bf3d40c2c (diff) | |
download | MediaProvider-b2a44a3dca81398e47ec5d88cced4fb9465237eb.tar.gz |
Merge SP2A.220305.012sam_222710654
Bug: 219523960
Merged-In: I0cfc25feaa946e0710fe87df7a1b587c61ca6dd4
Change-Id: Iff8b424fd7f1389423308c1f270ccdf03f600e68
-rw-r--r-- | .prebuilt_info/prebuilt_info_current_current_zip.asciipb | 2 | ||||
-rw-r--r-- | current/hiddenapi/all-flags.csv | 1 | ||||
-rw-r--r-- | current/hiddenapi/index.csv | 10 | ||||
-rw-r--r-- | current/hiddenapi/stub-flags.csv | 1 | ||||
-rw-r--r-- | current/sdk_library/module-lib/framework-mediaprovider-stubs.jar | bin | 27093 -> 27040 bytes | |||
-rw-r--r-- | current/sdk_library/module-lib/framework-mediaprovider.srcjar | bin | 5552 -> 5551 bytes | |||
-rw-r--r-- | current/sdk_library/public/framework-mediaprovider-stubs.jar | bin | 26946 -> 26898 bytes | |||
-rw-r--r-- | current/sdk_library/public/framework-mediaprovider.srcjar | bin | 23410 -> 23213 bytes | |||
-rw-r--r-- | current/sdk_library/public/framework-mediaprovider.txt | 2 | ||||
-rw-r--r-- | current/sdk_library/system/framework-mediaprovider-stubs.jar | bin | 27093 -> 27040 bytes | |||
-rw-r--r-- | current/sdk_library/system/framework-mediaprovider.srcjar | bin | 5552 -> 5551 bytes |
11 files changed, 9 insertions, 7 deletions
diff --git a/.prebuilt_info/prebuilt_info_current_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_current_zip.asciipb index 90f75c8..b2741e6 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: "7824087" + build_id: "8012820" target: "mainline_modules-user" source_file: "mainline-sdks/mediaprovider-module-sdk-current.zip" } diff --git a/current/hiddenapi/all-flags.csv b/current/hiddenapi/all-flags.csv index fdf498c..48b46b2 100644 --- a/current/hiddenapi/all-flags.csv +++ b/current/hiddenapi/all-flags.csv @@ -1,5 +1,6 @@ Landroid/provider/Column;->readOnly()Z,blocked Landroid/provider/Column;->value()I,blocked +Landroid/provider/ExportedSince;->osVersion()I,blocked Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,sdk,system-api,test-api Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,sdk,system-api,test-api Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,sdk,system-api,test-api diff --git a/current/hiddenapi/index.csv b/current/hiddenapi/index.csv index 39f5c76..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,1770,13,1770,96,maxTargetSdk=30&trackingBug=170729553L -Landroid/provider/MediaStore$Files$FileColumns;->FORMAT:Ljava/lang/String;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1779,13,1779,33, -Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1732,9,1732,29, -Landroid/provider/MediaStore$Files;->getMtpObjectsUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1738,9,1738,29, -Landroid/provider/MediaStore$Files;->getMtpReferencesUri(Ljava/lang/String;J)Landroid/net/Uri;,packages/providers/MediaProvider/apex/framework/java/android/provider/MediaStore.java,1744,9,1744,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 604aa04..6789742 100644 --- a/current/hiddenapi/stub-flags.csv +++ b/current/hiddenapi/stub-flags.csv @@ -1,5 +1,6 @@ Landroid/provider/Column;->readOnly()Z Landroid/provider/Column;->value()I +Landroid/provider/ExportedSince;->osVersion()I Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM:Ljava/lang/String;,public-api,system-api,test-api Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ART:Ljava/lang/String;,public-api,system-api,test-api Landroid/provider/MediaStore$Audio$AlbumColumns;->ALBUM_ID:Ljava/lang/String;,public-api,system-api,test-api diff --git a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar Binary files differindex dabd7af..b83a414 100644 --- a/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar +++ b/current/sdk_library/module-lib/framework-mediaprovider-stubs.jar diff --git a/current/sdk_library/module-lib/framework-mediaprovider.srcjar b/current/sdk_library/module-lib/framework-mediaprovider.srcjar Binary files differindex 37f7315..e2885bd 100644 --- a/current/sdk_library/module-lib/framework-mediaprovider.srcjar +++ b/current/sdk_library/module-lib/framework-mediaprovider.srcjar diff --git a/current/sdk_library/public/framework-mediaprovider-stubs.jar b/current/sdk_library/public/framework-mediaprovider-stubs.jar Binary files differindex 8f77500..b502333 100644 --- a/current/sdk_library/public/framework-mediaprovider-stubs.jar +++ b/current/sdk_library/public/framework-mediaprovider-stubs.jar diff --git a/current/sdk_library/public/framework-mediaprovider.srcjar b/current/sdk_library/public/framework-mediaprovider.srcjar Binary files differindex 9e35440..112a082 100644 --- a/current/sdk_library/public/framework-mediaprovider.srcjar +++ b/current/sdk_library/public/framework-mediaprovider.srcjar diff --git a/current/sdk_library/public/framework-mediaprovider.txt b/current/sdk_library/public/framework-mediaprovider.txt index 2e6312c..0a53fb5 100644 --- a/current/sdk_library/public/framework-mediaprovider.txt +++ b/current/sdk_library/public/framework-mediaprovider.txt @@ -323,7 +323,7 @@ package android.provider { field public static final String CD_TRACK_NUMBER = "cd_track_number"; field public static final String COMPILATION = "compilation"; field public static final String COMPOSER = "composer"; - field @Deprecated public static final String DATA = "_data"; + field public static final String DATA = "_data"; field public static final String DATE_ADDED = "date_added"; field public static final String DATE_EXPIRES = "date_expires"; field public static final String DATE_MODIFIED = "date_modified"; diff --git a/current/sdk_library/system/framework-mediaprovider-stubs.jar b/current/sdk_library/system/framework-mediaprovider-stubs.jar Binary files differindex dabd7af..b83a414 100644 --- a/current/sdk_library/system/framework-mediaprovider-stubs.jar +++ b/current/sdk_library/system/framework-mediaprovider-stubs.jar diff --git a/current/sdk_library/system/framework-mediaprovider.srcjar b/current/sdk_library/system/framework-mediaprovider.srcjar Binary files differindex 37f7315..e2885bd 100644 --- a/current/sdk_library/system/framework-mediaprovider.srcjar +++ b/current/sdk_library/system/framework-mediaprovider.srcjar |