Shortcut integration with AppSearch (Part 7)

Use optmized queries instead of iterating through every shortcuts where
possible.

Bug: 151359749
Test: atest ShortcutManagerTest1 ShortcutManagerTest2
    ShortcutManagerTest3 ShortcutManagerTest4 ShortcutManagerTest5
    ShortcutManagerTest6 ShortcutManagerTest7 ShortcutManagerTest8
    ShortcutManagerTest9 ShortcutManagerTest10 ShortcutManagerTest11

Change-Id: I85efac531162c2497ba5f84980c3e19e93f6e3bc

1 files changed, 191 insertions, 17 deletions

diff --git a/core/java/android/content/pm/AppSearchShortcutInfo.java b/core/java/android/content/pm/AppSearchShortcutInfo.java
index b2478ca12191..94ec292eb88d 100644
--- a/core/java/android/content/pm/AppSearchShortcutInfo.java
+++ b/core/java/android/content/pm/AppSearchShortcutInfo.java
@@ -163,8 +163,10 @@ public class AppSearchShortcutInfo extends GenericDocument {
                     .setIndexingType(AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
                     .build()
 
-            ).addProperty(new AppSearchSchema.Int64PropertyConfig.Builder(KEY_RANK)
+            ).addProperty(new AppSearchSchema.StringPropertyConfig.Builder(KEY_RANK)
                     .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                    .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
                     .build()
 
             ).addProperty(new AppSearchSchema.Int64PropertyConfig.Builder(KEY_IMPLICIT_RANK)
@@ -175,8 +177,10 @@ public class AppSearchShortcutInfo extends GenericDocument {
                     .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
                     .build()
 
-            ).addProperty(new AppSearchSchema.Int64PropertyConfig.Builder(KEY_FLAGS)
+            ).addProperty(new AppSearchSchema.StringPropertyConfig.Builder(KEY_FLAGS)
                     .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REPEATED)
+                    .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
                     .build()
 
             ).addProperty(new AppSearchSchema.Int64PropertyConfig.Builder(KEY_ICON_RES_ID)
@@ -201,12 +205,84 @@ public class AppSearchShortcutInfo extends GenericDocument {
                     .setIndexingType(AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_NONE)
                     .build()
 
-            ).addProperty(new AppSearchSchema.Int64PropertyConfig.Builder(KEY_DISABLED_REASON)
+            ).addProperty(new AppSearchSchema.StringPropertyConfig.Builder(KEY_DISABLED_REASON)
                     .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
+                    .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .setIndexingType(AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
                     .build()
 
             ).build();
 
+    private static final String IS_DYNAMIC = "isDynamic";
+    private static final String NOT_DYNAMIC = "notDynamic";
+    private static final String IS_PINNED = "isPinned";
+    private static final String NOT_PINNED = "notPinned";
+    private static final String HAS_ICON_RES = "hasIconRes";
+    private static final String NO_ICON_RES = "noIconRes";
+    private static final String HAS_ICON_FILE = "hasIconFile";
+    private static final String NO_ICON_FILE = "noIconFile";
+    private static final String IS_KEY_FIELD_ONLY = "isKeyFieldOnly";
+    private static final String NOT_KEY_FIELD_ONLY = "notKeyFieldOnly";
+    private static final String IS_MANIFEST = "isManifest";
+    private static final String NOT_MANIFEST = "notManifest";
+    private static final String IS_DISABLED = "isDisabled";
+    private static final String NOT_DISABLED = "notDisabled";
+    private static final String ARE_STRINGS_RESOLVED = "areStringsResolved";
+    private static final String NOT_STRINGS_RESOLVED = "notStringsResolved";
+    private static final String IS_IMMUTABLE = "isImmutable";
+    private static final String NOT_IMMUTABLE = "notImmutable";
+    private static final String HAS_ADAPTIVE_BITMAP = "hasAdaptiveBitmap";
+    private static final String NO_ADAPTIVE_BITMAP = "noAdaptiveBitmap";
+    private static final String IS_RETURNED_BY_SERVICE = "isReturnedByService";
+    private static final String NOT_RETURNED_BY_SERVICE = "notReturnedByService";
+    private static final String HAS_ICON_FILE_PENDING_SAVE = "hasIconFilePendingSave";
+    private static final String NO_ICON_FILE_PENDING_SAVE = "noIconFilePendingSave";
+    private static final String IS_SHADOW = "isShadow";
+    private static final String NOT_SHADOW = "notShadow";
+    private static final String IS_LONG_LIVED = "isLongLived";
+    private static final String NOT_LONG_LIVED = "notLongLived";
+    private static final String HAS_ICON_URI = "hasIconUri";
+    private static final String NO_ICON_URI = "noIconUri";
+    private static final String IS_CACHED_NOTIFICATION = "isCachedNotification";
+    private static final String NOT_CACHED_NOTIFICATION = "notCachedNotification";
+    private static final String IS_CACHED_BUBBLE = "isCachedBubble";
+    private static final String NOT_CACHED_BUBBLE = "notCachedBubble";
+    private static final String IS_CACHED_PEOPLE_TITLE = "isCachedPeopleTitle";
+    private static final String NOT_CACHED_PEOPLE_TITLE = "notCachedPeopleTitle";
+
+    public static final String QUERY_IS_DYNAMIC = KEY_FLAGS + ":" + IS_DYNAMIC;
+    public static final String QUERY_IS_NOT_DYNAMIC = KEY_FLAGS + ":" + NOT_DYNAMIC;
+    public static final String QUERY_IS_PINNED = KEY_FLAGS + ":" + IS_PINNED;
+    public static final String QUERY_IS_NOT_PINNED = KEY_FLAGS + ":" + NOT_PINNED;
+    public static final String QUERY_IS_MANIFEST = KEY_FLAGS + ":" + IS_MANIFEST;
+    public static final String QUERY_IS_NOT_MANIFEST = KEY_FLAGS + ":" + NOT_MANIFEST;
+    public static final String QUERY_IS_PINNED_AND_ENABLED =
+            "(" + KEY_FLAGS + ":" + IS_PINNED + " " + KEY_FLAGS + ":" + NOT_DISABLED + ")";
+    public static final String QUERY_IS_CACHED =
+            "(" + KEY_FLAGS + ":" + IS_CACHED_NOTIFICATION + " OR "
+            + KEY_FLAGS + ":" + IS_CACHED_BUBBLE + " OR "
+            + KEY_FLAGS + ":" + IS_CACHED_PEOPLE_TITLE + ")";
+    public static final String QUERY_IS_NOT_CACHED =
+            "(" + KEY_FLAGS + ":" + NOT_CACHED_NOTIFICATION + " "
+                    + KEY_FLAGS + ":" + NOT_CACHED_BUBBLE + " "
+                    + KEY_FLAGS + ":" + NOT_CACHED_PEOPLE_TITLE + ")";
+    public static final String QUERY_IS_FLOATING =
+            "((" + IS_PINNED + " OR " + QUERY_IS_CACHED + ") "
+                    + QUERY_IS_NOT_DYNAMIC + " " + QUERY_IS_NOT_MANIFEST + ")";
+    public static final String QUERY_IS_NOT_FLOATING =
+            "((" + QUERY_IS_NOT_PINNED + " " + QUERY_IS_NOT_CACHED + ") OR "
+                    + QUERY_IS_DYNAMIC + " OR " + QUERY_IS_MANIFEST + ")";
+    public static final String QUERY_IS_NOT_DISABLED_DUE_TO_RESTORE =
+            "(" + KEY_DISABLED_REASON + ":" + ShortcutInfo.DISABLED_REASON_NOT_DISABLED
+                    + " OR " + KEY_DISABLED_REASON + ":"
+                    + ShortcutInfo.DISABLED_REASON_BY_APP
+                    + " OR " + KEY_DISABLED_REASON + ":"
+                    + ShortcutInfo.DISABLED_REASON_APP_CHANGED
+                    + " OR " + KEY_DISABLED_REASON + ":"
+                    + ShortcutInfo.DISABLED_REASON_UNKNOWN + ")";
+    public static final String QUERY_DISABLED_REASON_VERSION_LOWER =
+            KEY_DISABLED_REASON + ":" + ShortcutInfo.DISABLED_REASON_VERSION_LOWER;
+
     public AppSearchShortcutInfo(@NonNull GenericDocument document) {
         super(document);
     }
@@ -304,16 +380,16 @@ public class AppSearchShortcutInfo extends GenericDocument {
         final Person[] persons = parsePerson(getPropertyDocumentArray(KEY_PERSON));
         final String locusIdString = getPropertyString(KEY_LOCUS_ID);
         final LocusId locusId = locusIdString == null ? null : new LocusId(locusIdString);
-        final int rank = (int) getPropertyLong(KEY_RANK);
+        final int rank = Integer.parseInt(getPropertyString(KEY_RANK));
         final int implicitRank = (int) getPropertyLong(KEY_IMPLICIT_RANK);
         final byte[] extrasByte = getPropertyBytes(KEY_EXTRAS);
         final PersistableBundle extras = transformToPersistableBundle(extrasByte);
-        final int flags = parseFlags(getPropertyLongArray(KEY_FLAGS));
+        final int flags = parseFlags(getPropertyStringArray(KEY_FLAGS));
         final int iconResId = (int) getPropertyLong(KEY_ICON_RES_ID);
         final String iconResName = getPropertyString(KEY_ICON_RES_NAME);
         final String iconUri = getPropertyString(KEY_ICON_URI);
         final String bitmapPath = getPropertyString(KEY_BITMAP_PATH);
-        final int disabledReason = (int) getPropertyLong(KEY_DISABLED_REASON);
+        final int disabledReason = Integer.parseInt(getPropertyString(KEY_DISABLED_REASON));
         final ShortcutInfo si = new ShortcutInfo(
                 userId, getUri(), packageName, activity, icon, shortLabel, shortLabelResId,
                 shortLabelResName, longLabel, longLabelResId, longLabelResName, disabledMessage,
@@ -546,7 +622,7 @@ public class AppSearchShortcutInfo extends GenericDocument {
         @NonNull
         public Builder setRank(final int rank) {
             Preconditions.checkArgument((0 <= rank), "Rank cannot be negative");
-            setPropertyLong(KEY_RANK, rank);
+            setPropertyString(KEY_RANK, String.valueOf(rank));
             return this;
         }
 
@@ -574,7 +650,10 @@ public class AppSearchShortcutInfo extends GenericDocument {
          * @hide
          */
         public Builder setFlags(@ShortcutInfo.ShortcutFlags final int flags) {
-            setPropertyLong(KEY_FLAGS, flattenFlags(flags));
+            final String[] flagArray = flattenFlags(flags);
+            if (flagArray != null && flagArray.length > 0) {
+                setPropertyString(KEY_FLAGS, flagArray);
+            }
             return this;
         }
 
@@ -621,7 +700,7 @@ public class AppSearchShortcutInfo extends GenericDocument {
          * @hide
          */
         public Builder setDisabledReason(@ShortcutInfo.DisabledReason final int disabledReason) {
-            setPropertyLong(KEY_DISABLED_REASON, disabledReason);
+            setPropertyString(KEY_DISABLED_REASON, String.valueOf(disabledReason));
             return this;
         }
 
@@ -682,20 +761,115 @@ public class AppSearchShortcutInfo extends GenericDocument {
         }
     }
 
-    private static long[] flattenFlags(@ShortcutInfo.ShortcutFlags final int flags) {
-        final List<Integer> flattenedFlags = new ArrayList<>();
-        flattenedFlags.add(0);
+    private static String[] flattenFlags(@ShortcutInfo.ShortcutFlags final int flags) {
+        final List<String> flattenedFlags = new ArrayList<>();
         for (int i = 0; i < 31; i++) {
             final int mask = 1 << i;
-            if ((flags & mask) != 0) {
-                flattenedFlags.add(mask);
+            final String value = flagToString(flags, mask);
+            if (value != null) {
+                flattenedFlags.add(value);
             }
         }
-        return flattenedFlags.stream().mapToLong(i -> i).toArray();
+        return flattenedFlags.toArray(new String[0]);
+    }
+
+    @Nullable
+    private static String flagToString(
+            @ShortcutInfo.ShortcutFlags final int flags, final int mask) {
+        switch (mask) {
+            case ShortcutInfo.FLAG_DYNAMIC:
+                return (flags & mask) != 0 ? IS_DYNAMIC : NOT_DYNAMIC;
+            case ShortcutInfo.FLAG_PINNED:
+                return (flags & mask) != 0 ? IS_PINNED : NOT_PINNED;
+            case ShortcutInfo.FLAG_HAS_ICON_RES:
+                return (flags & mask) != 0 ? HAS_ICON_RES : NO_ICON_RES;
+            case ShortcutInfo.FLAG_HAS_ICON_FILE:
+                return (flags & mask) != 0 ? HAS_ICON_FILE : NO_ICON_FILE;
+            case ShortcutInfo.FLAG_KEY_FIELDS_ONLY:
+                return (flags & mask) != 0 ? IS_KEY_FIELD_ONLY : NOT_KEY_FIELD_ONLY;
+            case ShortcutInfo.FLAG_MANIFEST:
+                return (flags & mask) != 0 ? IS_MANIFEST : NOT_MANIFEST;
+            case ShortcutInfo.FLAG_DISABLED:
+                return (flags & mask) != 0 ? IS_DISABLED : NOT_DISABLED;
+            case ShortcutInfo.FLAG_STRINGS_RESOLVED:
+                return (flags & mask) != 0 ? ARE_STRINGS_RESOLVED : NOT_STRINGS_RESOLVED;
+            case ShortcutInfo.FLAG_IMMUTABLE:
+                return (flags & mask) != 0 ? IS_IMMUTABLE : NOT_IMMUTABLE;
+            case ShortcutInfo.FLAG_ADAPTIVE_BITMAP:
+                return (flags & mask) != 0 ? HAS_ADAPTIVE_BITMAP : NO_ADAPTIVE_BITMAP;
+            case ShortcutInfo.FLAG_RETURNED_BY_SERVICE:
+                return (flags & mask) != 0 ? IS_RETURNED_BY_SERVICE : NOT_RETURNED_BY_SERVICE;
+            case ShortcutInfo.FLAG_ICON_FILE_PENDING_SAVE:
+                return (flags & mask) != 0 ? HAS_ICON_FILE_PENDING_SAVE : NO_ICON_FILE_PENDING_SAVE;
+            case ShortcutInfo.FLAG_SHADOW:
+                return (flags & mask) != 0 ? IS_SHADOW : NOT_SHADOW;
+            case ShortcutInfo.FLAG_LONG_LIVED:
+                return (flags & mask) != 0 ? IS_LONG_LIVED : NOT_LONG_LIVED;
+            case ShortcutInfo.FLAG_HAS_ICON_URI:
+                return (flags & mask) != 0 ? HAS_ICON_URI : NO_ICON_URI;
+            case ShortcutInfo.FLAG_CACHED_NOTIFICATIONS:
+                return (flags & mask) != 0 ? IS_CACHED_NOTIFICATION : NOT_CACHED_NOTIFICATION;
+            case ShortcutInfo.FLAG_CACHED_BUBBLES:
+                return (flags & mask) != 0 ? IS_CACHED_BUBBLE : NOT_CACHED_BUBBLE;
+            case ShortcutInfo.FLAG_CACHED_PEOPLE_TILE:
+                return (flags & mask) != 0 ? IS_CACHED_PEOPLE_TITLE : NOT_CACHED_PEOPLE_TITLE;
+            default:
+                return null;
+        }
     }
 
-    private static int parseFlags(final long[] flags) {
-        return (int) Arrays.stream(flags).reduce((p, v) -> p | v).getAsLong();
+    private static int parseFlags(@Nullable final String[] flags) {
+        if (flags == null) {
+            return 0;
+        }
+        int ret = 0;
+        for (int i = 0; i < flags.length; i++) {
+            ret = ret | parseFlag(flags[i]);
+        }
+        return ret;
+    }
+
+    private static int parseFlag(final String value) {
+        switch (value) {
+            case IS_DYNAMIC:
+                return ShortcutInfo.FLAG_DYNAMIC;
+            case IS_PINNED:
+                return ShortcutInfo.FLAG_PINNED;
+            case HAS_ICON_RES:
+                return ShortcutInfo.FLAG_HAS_ICON_RES;
+            case HAS_ICON_FILE:
+                return ShortcutInfo.FLAG_HAS_ICON_FILE;
+            case IS_KEY_FIELD_ONLY:
+                return ShortcutInfo.FLAG_KEY_FIELDS_ONLY;
+            case IS_MANIFEST:
+                return ShortcutInfo.FLAG_MANIFEST;
+            case IS_DISABLED:
+                return ShortcutInfo.FLAG_DISABLED;
+            case ARE_STRINGS_RESOLVED:
+                return ShortcutInfo.FLAG_STRINGS_RESOLVED;
+            case IS_IMMUTABLE:
+                return ShortcutInfo.FLAG_IMMUTABLE;
+            case HAS_ADAPTIVE_BITMAP:
+                return ShortcutInfo.FLAG_ADAPTIVE_BITMAP;
+            case IS_RETURNED_BY_SERVICE:
+                return ShortcutInfo.FLAG_RETURNED_BY_SERVICE;
+            case HAS_ICON_FILE_PENDING_SAVE:
+                return ShortcutInfo.FLAG_ICON_FILE_PENDING_SAVE;
+            case IS_SHADOW:
+                return ShortcutInfo.FLAG_SHADOW;
+            case IS_LONG_LIVED:
+                return ShortcutInfo.FLAG_LONG_LIVED;
+            case HAS_ICON_URI:
+                return ShortcutInfo.FLAG_HAS_ICON_URI;
+            case IS_CACHED_NOTIFICATION:
+                return ShortcutInfo.FLAG_CACHED_NOTIFICATIONS;
+            case IS_CACHED_BUBBLE:
+                return ShortcutInfo.FLAG_CACHED_BUBBLES;
+            case IS_CACHED_PEOPLE_TITLE:
+                return ShortcutInfo.FLAG_CACHED_PEOPLE_TILE;
+            default:
+                return 0;
+        }
     }
 
     @NonNull