commit 1a39302550102ee5dd41c3bc9af335f5397b5f02
author Zimuzo Ezeozue <zezeozue@google.com> Mon Nov 22 17:28:46 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 22 17:28:46 2021 +0000
tree 9fc94136a983b07d984337ebed3141a5f3b2694f
parent 96e244f3e2c2c3d373dd00a5dd64c52bb70aa086
parent 4437138f9cb702aa4ef2ce2e9201388e153224e1

Merge "Remove unnecessary module_libraries @SystemApi annotation" into sc-mainline-prod

apex/framework/api/module-lib-current.txt

diff --git a/apex/framework/api/module-lib-current.txt b/apex/framework/api/module-lib-current.txt
index eae8f7a..d802177 100644
--- a/apex/framework/api/module-lib-current.txt
+++ b/apex/framework/api/module-lib-current.txt
@@ -1,41 +1 @@
 // Signature format: 2.0
-package android.provider {
-
-  public final class CloudMediaProviderContract {
-    field public static final String EXTRA_FILTER_ALBUM = "android.provider.extra.FILTER_ALBUM";
-    field public static final String EXTRA_FILTER_MIMETYPE = "android.provider.extra.FILTER_MIMETYPE";
-    field public static final String EXTRA_FILTER_SIZE_BYTES = "android.provider.extra.FILTER_SIZE_BYTES";
-    field public static final String EXTRA_GENERATION = "android.provider.extra.GENERATION";
-    field public static final String EXTRA_PAGE_TOKEN = "android.provider.extra.PAGE_TOKEN";
-    field public static final String MANAGE_CLOUD_MEDIA_PROVIDERS_PERMISSION = "com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS";
-    field public static final String METHOD_GET_MEDIA_INFO = "android:getMediaInfo";
-    field public static final String PROVIDER_INTERFACE = "android.content.action.CLOUD_MEDIA_PROVIDER";
-  }
-
-  public static final class CloudMediaProviderContract.AlbumColumns {
-    field public static final String DATE_TAKEN_MS = "date_taken_ms";
-    field public static final String DISPLAY_NAME = "display_name";
-    field public static final String ID = "id";
-    field public static final String MEDIA_COUNT = "album_media_count";
-    field public static final String MEDIA_COVER_ID = "album_media_cover_id";
-  }
-
-  public static final class CloudMediaProviderContract.MediaColumns {
-    field public static final String DATE_TAKEN_MS = "date_taken_ms";
-    field public static final String DURATION_MS = "duration_ms";
-    field public static final String GENERATION_MODIFIED = "generation_modified";
-    field public static final String ID = "id";
-    field public static final String IS_FAVORITE = "is_favorite";
-    field public static final String MEDIA_STORE_URI = "media_store_uri";
-    field public static final String MIME_TYPE = "mime_type";
-    field public static final String SIZE_BYTES = "size_bytes";
-  }
-
-  public static final class CloudMediaProviderContract.MediaInfo {
-    field public static final String MEDIA_COUNT = "media_count";
-    field public static final String MEDIA_GENERATION = "media_generation";
-    field public static final String MEDIA_VERSION = "media_version";
-  }
-
-}
-

apex/framework/java/android/provider/CloudMediaProviderContract.java

diff --git a/apex/framework/java/android/provider/CloudMediaProviderContract.java b/apex/framework/java/android/provider/CloudMediaProviderContract.java
index f8a2811..fef8e6b 100644
--- a/apex/framework/java/android/provider/CloudMediaProviderContract.java
+++ b/apex/framework/java/android/provider/CloudMediaProviderContract.java
@@ -34,7 +34,6 @@
  *
  * @hide
  */
-@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class CloudMediaProviderContract {
     private static final String TAG = "CloudMediaProviderContract";
 
@@ -433,7 +432,6 @@
      *
      * {@hide}
      */
-    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
     public static final String METHOD_GET_MEDIA_INFO = "android:getMediaInfo";
 
     /**