From a9f0294b0eee9bedbd2543f6615c94f92a69eef2 Mon Sep 17 00:00:00 2001
From: Mehdi Alizadeh <mett@google.com>
Date: Tue, 16 Apr 2019 11:28:04 -0700
Subject: [PATCH] Make deprecated AppTarget APIs visible

Some deprecated APIs are still in use and need to stay visible. The SDK
in google3 is 2 weeks behind and will not receive the replacement APIs
until then.

Bug: 130610898
Test: atest AppPredictionServiceTest
Test: Verified that predictions are being loaded in AllApps
Change-Id: Ib6277f9fc46f1fe55a2cec4fc563ecdc964ce8a7
---
 api/system-current.txt                          | 3 +++
 api/test-current.txt                            | 2 ++
 core/java/android/app/prediction/AppTarget.java | 3 +--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index cd5a6e760a7fb..cb376dc719793 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1092,11 +1092,14 @@ package android.app.prediction {
   }
 
   public static final class AppTarget.Builder {
+    ctor @Deprecated public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId);
     ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle);
     ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo);
     method @NonNull public android.app.prediction.AppTarget build();
     method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);
     method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);
+    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
+    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
   }
 
   public final class AppTargetEvent implements android.os.Parcelable {
diff --git a/api/test-current.txt b/api/test-current.txt
index f3fa5a0804e9a..0369c78f47fef 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -503,6 +503,8 @@ package android.app.prediction {
     method @NonNull public android.app.prediction.AppTarget build();
     method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);
     method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);
+    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
+    method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
   }
 
   public final class AppTargetEvent implements android.os.Parcelable {
diff --git a/core/java/android/app/prediction/AppTarget.java b/core/java/android/app/prediction/AppTarget.java
index 4704661c2b24b..61e4569c1228b 100644
--- a/core/java/android/app/prediction/AppTarget.java
+++ b/core/java/android/app/prediction/AppTarget.java
@@ -208,6 +208,7 @@ public final class AppTarget implements Parcelable {
          * @hide
          */
         @Deprecated
+        @SystemApi
         public Builder(@NonNull AppTargetId id) {
             mId = id;
         }
@@ -243,7 +244,6 @@ public final class AppTarget implements Parcelable {
 
         /**
          * @deprecated Use the appropriate constructor.
-         * @hide
          */
         @NonNull
         @Deprecated
@@ -258,7 +258,6 @@ public final class AppTarget implements Parcelable {
 
         /**
          * @deprecated Use the appropriate constructor.
-         * @hide
          */
         @NonNull
         @Deprecated