From cc051d4d5e8721fe3beb2830ba65286c80f255b4 Mon Sep 17 00:00:00 2001
From: Mehdi Alizadeh <mett@google.com>
Date: Mon, 16 Mar 2020 14:12:08 -0700
Subject: [PATCH] Make LauncherApps#ShortcutQuery#setLocusId() public

Bug: 150219458
Test: atest com.android.server.pm.ShortcutManagerTest1 \
            com.android.server.pm.ShortcutManagerTest2 \
            com.android.server.pm.ShortcutManagerTest3 \
            com.android.server.pm.ShortcutManagerTest4 \
            com.android.server.pm.ShortcutManagerTest5 \
            com.android.server.pm.ShortcutManagerTest6 \
            com.android.server.pm.ShortcutManagerTest7 \
            com.android.server.pm.ShortcutManagerTest8 \
            com.android.server.pm.ShortcutManagerTest9 \
            com.android.server.pm.ShortcutManagerTest10
Test: atest DataManagerTest
Change-Id: I546e12ac57db76ec40dc25316168c19e76393e20
---
 api/current.txt                                | 1 +
 api/system-current.txt                         | 4 ----
 core/java/android/content/pm/LauncherApps.java | 3 ---
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index 3ed4125a23f66..079fd358855ae 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -11721,6 +11721,7 @@ package android.content.pm {
     ctor public LauncherApps.ShortcutQuery();
     method public android.content.pm.LauncherApps.ShortcutQuery setActivity(@Nullable android.content.ComponentName);
     method public android.content.pm.LauncherApps.ShortcutQuery setChangedSince(long);
+    method @NonNull public android.content.pm.LauncherApps.ShortcutQuery setLocusIds(@Nullable java.util.List<android.content.LocusId>);
     method public android.content.pm.LauncherApps.ShortcutQuery setPackage(@Nullable String);
     method public android.content.pm.LauncherApps.ShortcutQuery setQueryFlags(int);
     method public android.content.pm.LauncherApps.ShortcutQuery setShortcutIds(@Nullable java.util.List<java.lang.String>);
diff --git a/api/system-current.txt b/api/system-current.txt
index 9eb5ed996f495..c8047f4f7cb2a 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -2108,10 +2108,6 @@ package android.content.pm {
     field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.LauncherApps.AppUsageLimit> CREATOR;
   }
 
-  public static class LauncherApps.ShortcutQuery {
-    method @NonNull public android.content.pm.LauncherApps.ShortcutQuery setLocusIds(@Nullable java.util.List<android.content.LocusId>);
-  }
-
   public class PackageInstaller {
     method @RequiresPermission(android.Manifest.permission.INSTALL_PACKAGES) public void setPermissionsResult(int, boolean);
     field public static final int DATA_LOADER_TYPE_INCREMENTAL = 2; // 0x2
diff --git a/core/java/android/content/pm/LauncherApps.java b/core/java/android/content/pm/LauncherApps.java
index 4e4897f59ad38..22516f069e830 100644
--- a/core/java/android/content/pm/LauncherApps.java
+++ b/core/java/android/content/pm/LauncherApps.java
@@ -460,10 +460,7 @@ public class LauncherApps {
         /**
          * If non-null, return only the specified shortcuts by locus ID.  When setting this field,
          * a package name must also be set with {@link #setPackage}.
-         *
-         * @hide
          */
-        @SystemApi
         @NonNull
         public ShortcutQuery setLocusIds(@Nullable List<LocusId> locusIds) {
             mLocusIds = locusIds;