Merge "Rename MediaCollections capability to MediaCategories for consistency" into main

3 files changed, 19 insertions, 19 deletions

diff --git a/apex/framework/api/current.txt b/apex/framework/api/current.txt
index cbe958d38..f62ec73d9 100644
--- a/apex/framework/api/current.txt
+++ b/apex/framework/api/current.txt
@@ -90,7 +90,7 @@ package android.provider {
 
   @FlaggedApi("com.android.providers.media.flags.enable_cloud_media_provider_capabilities") public static final class CloudMediaProviderContract.Capabilities implements android.os.Parcelable {
     method public int describeContents();
-    method @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public boolean isMediaCollectionsEnabled();
+    method @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public boolean isMediaCategoriesEnabled();
     method @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public boolean isSearchEnabled();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.provider.CloudMediaProviderContract.Capabilities> CREATOR;
@@ -99,7 +99,7 @@ package android.provider {
   @FlaggedApi("com.android.providers.media.flags.enable_cloud_media_provider_capabilities") public static final class CloudMediaProviderContract.Capabilities.Builder {
     ctor public CloudMediaProviderContract.Capabilities.Builder();
     method @NonNull public android.provider.CloudMediaProviderContract.Capabilities build();
-    method @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") @NonNull public android.provider.CloudMediaProviderContract.Capabilities.Builder setMediaCollectionsEnabled(boolean);
+    method @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") @NonNull public android.provider.CloudMediaProviderContract.Capabilities.Builder setMediaCategoriesEnabled(boolean);
     method @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") @NonNull public android.provider.CloudMediaProviderContract.Capabilities.Builder setSearchEnabled(boolean);
   }
 
diff --git a/apex/framework/java/android/provider/CloudMediaProviderContract.java b/apex/framework/java/android/provider/CloudMediaProviderContract.java
index a5b84d72d..3bf0fed96 100644
--- a/apex/framework/java/android/provider/CloudMediaProviderContract.java
+++ b/apex/framework/java/android/provider/CloudMediaProviderContract.java
@@ -76,12 +76,12 @@ public final class CloudMediaProviderContract {
     public static final class Capabilities implements Parcelable {
 
         private boolean mSearchEnabled;
-        private boolean mMediaCollectionsEnabled;
+        private boolean mMediaCategoriesEnabled;
         private boolean mAlbumsAsCategory;
 
         Capabilities(@NonNull Builder builder) {
             this.mSearchEnabled = builder.mSearchEnabled;
-            this.mMediaCollectionsEnabled = builder.mMediaCollectionsEnabled;
+            this.mMediaCategoriesEnabled = builder.mMediaCategoriesEnabled;
             this.mAlbumsAsCategory = builder.mAlbumsAsCategoryEnabled;
         }
 
@@ -105,9 +105,9 @@ public final class CloudMediaProviderContract {
         }
 
         /**
-         * If the CloudMediaProvider supports MediaCollections.
+         * If the CloudMediaProvider supports MediaCategories.
          *
-         * In order for MediaCollections to be enabled the CloudMediaProvider needs to
+         * In order for MediaCategories to be enabled the CloudMediaProvider needs to
          * implement the following APIs:
          *
          * @see CloudMediaProvider#onQueryMediaCategories
@@ -115,11 +115,11 @@ public final class CloudMediaProviderContract {
          *
          * This capability is disabled by default.
          *
-         * @return true if media collections are enabled for this CloudMediaProvider.
+         * @return true if media categories are enabled for this CloudMediaProvider.
          */
         @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-        public boolean isMediaCollectionsEnabled() {
-            return mMediaCollectionsEnabled;
+        public boolean isMediaCategoriesEnabled() {
+            return mMediaCategoriesEnabled;
         }
 
         /**
@@ -133,7 +133,7 @@ public final class CloudMediaProviderContract {
         * then there will be no data for user custom albums.
         *
         * NOTE: This capability requires the
-        * {@link Capabilities#isMediaCollectionsEnabled} capability to also be enabled
+        * {@link Capabilities#isMediaCategoriesEnabled} capability to also be enabled
         * for the CloudMediaProvider. If it is not, this Capability has no effect and
         * will be ignored.
         *
@@ -164,7 +164,7 @@ public final class CloudMediaProviderContract {
         @Override
         public void writeToParcel(@NonNull Parcel dest, int flags) {
             dest.writeBoolean(mSearchEnabled);
-            dest.writeBoolean(mMediaCollectionsEnabled);
+            dest.writeBoolean(mMediaCategoriesEnabled);
             dest.writeBoolean(mAlbumsAsCategory);
         }
 
@@ -179,7 +179,7 @@ public final class CloudMediaProviderContract {
                     @Override
                     public Capabilities createFromParcel(Parcel source) {
                         boolean searchEnabled = source.readBoolean();
-                        boolean mediaCollectionsEnabled = source.readBoolean();
+                        boolean mediaCategoriesEnabled = source.readBoolean();
                         boolean mAlbumsAsCategoryEnabled = source.readBoolean();
 
                         Capabilities.Builder builder = new Capabilities.Builder();
@@ -187,7 +187,7 @@ public final class CloudMediaProviderContract {
                         if (Flags.cloudMediaProviderSearch()) {
                             builder
                                     .setSearchEnabled(searchEnabled)
-                                    .setMediaCollectionsEnabled(mediaCollectionsEnabled)
+                                    .setMediaCategoriesEnabled(mediaCategoriesEnabled)
                                     .setAlbumsAsCategoryEnabled(mAlbumsAsCategoryEnabled);
                         }
 
@@ -211,7 +211,7 @@ public final class CloudMediaProviderContract {
 
             // Default values for each capability. These are used if not explicitly changed.
             private boolean mSearchEnabled = false;
-            private boolean mMediaCollectionsEnabled = false;
+            private boolean mMediaCategoriesEnabled = false;
             private boolean mAlbumsAsCategoryEnabled = false;
 
             public Builder() {
@@ -235,7 +235,7 @@ public final class CloudMediaProviderContract {
             }
 
             /**
-             * The MediaCollections capability informs that collection related APIs are
+             * The MediaCategories capability informs that category related APIs are
              * supported and can be invoked on this provider.
              *
              * @see CloudMediaProvider#onQueryMediaCategories
@@ -245,8 +245,8 @@ public final class CloudMediaProviderContract {
              */
             @NonNull
             @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-            public Builder setMediaCollectionsEnabled(boolean enabled) {
-                mMediaCollectionsEnabled = enabled;
+            public Builder setMediaCategoriesEnabled(boolean enabled) {
+                mMediaCategoriesEnabled = enabled;
                 return this;
             }
 
@@ -261,7 +261,7 @@ public final class CloudMediaProviderContract {
              * then there will be no data for user custom albums.
              *
              * NOTE: This capability requires the
-             * {@link Capabilities#isMediaCollectionsEnabled} capability to also be enabled
+             * {@link Capabilities#isMediaCategoriesEnabled} capability to also be enabled
              * for the CloudMediaProvider. If it is not, this Capability has no effect and
              * will be ignored.
              *
diff --git a/apex/framework/java/android/provider/CmpApiVerifier.java b/apex/framework/java/android/provider/CmpApiVerifier.java
index 60a5513b0..592246e84 100644
--- a/apex/framework/java/android/provider/CmpApiVerifier.java
+++ b/apex/framework/java/android/provider/CmpApiVerifier.java
@@ -170,7 +170,7 @@ final class CmpApiVerifier {
                 // Verify CMP search capabilities if the search flag is on.
                 if (Flags.cloudMediaProviderSearch()) {
                     if (capabilities.isAlbumsAsCategoryEnabled()
-                            && !capabilities.isMediaCollectionsEnabled()) {
+                            && !capabilities.isMediaCategoriesEnabled()) {
                         errors.add(createIsNotValidLog("Declared capabilities are invalid. "
                                 + "AlbumsAsCategory capability can only be enabled when "
                                 + "MediaCollections is enabled."));