Change integer constants to strings in Search APIs

Bug: 376551109
Test: Build
Test: PickerSearchProviderClientTest.java
Flag: com.android.providers.media.flags.cloud_media_provider_search
Change-Id: I298c0ccb49479463d9b9f75f32d880e962ee4d6f

2 files changed, 35 insertions, 24 deletions

diff --git a/apex/framework/api/current.txt b/apex/framework/api/current.txt
index 696f2ca44..cbe958d38 100644
--- a/apex/framework/api/current.txt
+++ b/apex/framework/api/current.txt
@@ -70,13 +70,13 @@ package android.provider {
     field public static final String EXTRA_SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED = "android.provider.extra.SURFACE_CONTROLLER_AUDIO_MUTE_ENABLED";
     field public static final String EXTRA_SYNC_GENERATION = "android.provider.extra.SYNC_GENERATION";
     field public static final String MANAGE_CLOUD_MEDIA_PROVIDERS_PERMISSION = "com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS";
-    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS = 1; // 0x1
+    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final String MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS = "com.android.providers.media.MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS";
     field public static final String PROVIDER_INTERFACE = "android.content.action.CLOUD_MEDIA_PROVIDER";
-    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int SEARCH_SUGGESTION_ALBUM = 4; // 0x4
-    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int SEARCH_SUGGESTION_DATE = 3; // 0x3
-    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int SEARCH_SUGGESTION_FACE = 1; // 0x1
-    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int SEARCH_SUGGESTION_LOCATION = 2; // 0x2
-    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int SEARCH_SUGGESTION_TEXT = 0; // 0x0
+    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final String SEARCH_SUGGESTION_ALBUM = "com.android.providers.media.SEARCH_SUGGESTION_ALBUM";
+    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final String SEARCH_SUGGESTION_DATE = "com.android.providers.media.SEARCH_SUGGESTION_DATE";
+    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final String SEARCH_SUGGESTION_FACE = "com.android.providers.media.SEARCH_SUGGESTION_FACE";
+    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final String SEARCH_SUGGESTION_LOCATION = "com.android.providers.media.SEARCH_SUGGESTION_LOCATION";
+    field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final String SEARCH_SUGGESTION_TEXT = "com.android.providers.media.SEARCH_SUGGESTION_TEXT";
     field @FlaggedApi("com.android.providers.media.flags.cloud_media_provider_search") public static final int SORT_ORDER_DESC_DATE_TAKEN = 1; // 0x1
   }
 
diff --git a/apex/framework/java/android/provider/CloudMediaProviderContract.java b/apex/framework/java/android/provider/CloudMediaProviderContract.java
index 9433e3f77..30bbd162f 100644
--- a/apex/framework/java/android/provider/CloudMediaProviderContract.java
+++ b/apex/framework/java/android/provider/CloudMediaProviderContract.java
@@ -21,6 +21,7 @@ import static java.lang.annotation.RetentionPolicy.SOURCE;
 import android.annotation.FlaggedApi;
 import android.annotation.IntDef;
 import android.annotation.NonNull;
+import android.annotation.StringDef;
 import android.app.Activity;
 import android.content.ContentResolver;
 import android.content.Intent;
@@ -1306,19 +1307,21 @@ public final class CloudMediaProviderContract {
     /**
      * Represents media category related to faces of people and pets.
      * @see MediaCategoryColumns#MEDIA_CATEGORY_TYPE
-     * Type: INTEGER
+     * Type: STRING
      */
     @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-    public static final int MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS = 1;
+    public static final String MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS =
+            "com.android.providers.media.MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS";
 
     /**
      * Represents media category related to a user's custom albums.
      * @see MediaCategoryColumns#MEDIA_CATEGORY_TYPE
-     * Type: INTEGER
+     * Type: STRING
      *
      * @hide
      */
-    public static final int MEDIA_CATEGORY_TYPE_USER_ALBUMS = 2;
+    public static final String MEDIA_CATEGORY_TYPE_USER_ALBUMS =
+            "com.android.providers.media.MEDIA_CATEGORY_TYPE_USER_ALBUMS";
 
     /**
      * Defines the types of media categories available and supported in photo picker.
@@ -1327,9 +1330,12 @@ public final class CloudMediaProviderContract {
      * @see MediaCategoryColumns#MEDIA_CATEGORY_TYPE
      * @hide
      */
-    @IntDef(value = {MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS, MEDIA_CATEGORY_TYPE_USER_ALBUMS})
+    @StringDef(value = {
+            MEDIA_CATEGORY_TYPE_PEOPLE_AND_PETS,
+            MEDIA_CATEGORY_TYPE_USER_ALBUMS
+    })
     @Retention(SOURCE)
-    public @interface MediaCategoryTypes {}
+    public @interface MediaCategoryType {}
 
     /**
      * Represents a search suggestion provided by the {@link CloudMediaProvider}.
@@ -1411,43 +1417,48 @@ public final class CloudMediaProviderContract {
      * Represents a generic text search suggestion. This can be treated as a default when the type
      * of search suggestions is unknown.
      * @see SearchSuggestionColumns#TYPE
-     * Type: INTEGER
+     * Type: STRING
      */
     @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-    public static final int SEARCH_SUGGESTION_TEXT = 0;
+    public static final String SEARCH_SUGGESTION_TEXT =
+            "com.android.providers.media.SEARCH_SUGGESTION_TEXT";
 
     /**
      * Suggestion based on faces detected in photos.
      * @see SearchSuggestionColumns#TYPE
-     * Type: INTEGER
+     * Type: STRING
      */
     @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-    public static final int SEARCH_SUGGESTION_FACE = 1;
+    public static final String SEARCH_SUGGESTION_FACE =
+            "com.android.providers.media.SEARCH_SUGGESTION_FACE";
 
     /**
      * Suggestion based on location data associated with photos.
      * @see SearchSuggestionColumns#TYPE
-     * Type: INTEGER
+     * Type: STRING
      */
     @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-    public static final int SEARCH_SUGGESTION_LOCATION = 2;
+    public static final String SEARCH_SUGGESTION_LOCATION =
+            "com.android.providers.media.SEARCH_SUGGESTION_LOCATION";
 
     /**
      * Suggestion based on the date photos were taken.
      * @see SearchSuggestionColumns#TYPE
-     * Type: INTEGER
+     * Type: STRING
      */
     @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-    public static final int SEARCH_SUGGESTION_DATE = 3;
+    public static final String SEARCH_SUGGESTION_DATE =
+            "com.android.providers.media.SEARCH_SUGGESTION_DATE";
 
 
     /**
      * Suggestion based on user albums.
      * @see SearchSuggestionColumns#TYPE
-     * Type: INTEGER
+     * Type: STRING
      */
     @FlaggedApi(Flags.FLAG_CLOUD_MEDIA_PROVIDER_SEARCH)
-    public static final int SEARCH_SUGGESTION_ALBUM = 4;
+    public static final String SEARCH_SUGGESTION_ALBUM =
+            "com.android.providers.media.SEARCH_SUGGESTION_ALBUM";
 
     /**
      * Defines the different types of search suggestions available and supported in photo picker.
@@ -1455,7 +1466,7 @@ public final class CloudMediaProviderContract {
      * @see SearchSuggestionColumns#TYPE
      * @hide
      */
-    @IntDef(value = {
+    @StringDef(value = {
             SEARCH_SUGGESTION_TEXT,
             SEARCH_SUGGESTION_FACE,
             SEARCH_SUGGESTION_LOCATION,
@@ -1463,5 +1474,5 @@ public final class CloudMediaProviderContract {
             SEARCH_SUGGESTION_ALBUM
     })
     @Retention(SOURCE)
-    public @interface SEARCH_SUGGESTION_ALBUM {}
+    public @interface SearchSuggestionType {}
 }