From d6ef62f5a6a7df3c36a5ab9b6c0701f60ed1188c Mon Sep 17 00:00:00 2001
From: Wilson Wu <wilsonwu@google.com>
Date: Fri, 16 Sep 2022 15:01:02 +0800
Subject: [PATCH] Add maxTargetSdk restriction to IMM fields

CL[1] and CL[2] refined mCurId and mCurMethod into the
BindState, annotated them with deprecated.

This is a follow up change to add maxTargetSdk for these
UnsupportedAppUsage fields to be restricted android U.

[1]: I010bc0ad196492bfac244b756dcfd986b9075698
[2]: Ie29597118ab7f37d3f1ac2a5368b28f0462e7a0a

Bug: 236937383
Test: presubmit
Change-Id: I77859113768cb8545924e9e29473a20aa2f624c6
---
 .../android/view/inputmethod/InputMethodManager.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java
index 7794b7c90303c..8602ba050b99d 100644
--- a/core/java/android/view/inputmethod/InputMethodManager.java
+++ b/core/java/android/view/inputmethod/InputMethodManager.java
@@ -550,7 +550,10 @@ public final class InputMethodManager {
      */
     @Deprecated
     @GuardedBy("mH")
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(trackingBug = 236937383,
+            maxTargetSdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE,
+            publicAlternatives = "Apps should not change behavior based on the currently connected"
+                    + " IME. If absolutely needed, use {@link InputMethodInfo#getId()} instead.")
     String mCurId;
 
     /**
@@ -561,7 +564,9 @@ public final class InputMethodManager {
     @Deprecated
     @GuardedBy("mH")
     @Nullable
-    @UnsupportedAppUsage
+    @UnsupportedAppUsage(trackingBug = 236937383,
+            maxTargetSdk = Build.VERSION_CODES.UPSIDE_DOWN_CAKE,
+            publicAlternatives = "Use methods on {@link InputMethodManager} instead.")
     IInputMethodSession mCurMethod;
 
     /**