From db6c7815b7e14a58fe31458e5cbce4866a74f93d Mon Sep 17 00:00:00 2001
From: Tarandeep Singh <tarandeep@google.com>
Date: Wed, 10 Jul 2019 13:15:35 -0700
Subject: [PATCH] Make MULTI_CLIEN_IME_ENABLED non-testable.

This mechanically reverts making MULTI_CLIEN_IME_ENABLED
testable originally introduced in [1].
CTS tests can check for FEATURE_INPUT_METHODS instead.
FEATURE_INPUT_METHODS is false for Android auto and true for
devices that support installable IMEs.

[1] Id7b4dceb2dbfaf3d7ed1084957dd14b04cad0cdf

Bug: 137203665
Test: Manually built and verified that it builds.
Change-Id: I6e430458dd05dec363f67b62416d424c395f2d5a
---
 api/test-current.txt                                         | 5 -----
 .../android/view/inputmethod/InputMethodSystemProperty.java  | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/api/test-current.txt b/api/test-current.txt
index 050ec520059c3..10d6e4265fac2 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3492,11 +3492,6 @@ package android.view.inputmethod {
     method public boolean isInputMethodPickerShown();
   }
 
-  public class InputMethodSystemProperty {
-    ctor public InputMethodSystemProperty();
-    field public static final boolean MULTI_CLIENT_IME_ENABLED;
-  }
-
 }
 
 package android.view.inspector {
diff --git a/core/java/android/view/inputmethod/InputMethodSystemProperty.java b/core/java/android/view/inputmethod/InputMethodSystemProperty.java
index 0689806bf8328..e20c2fdc80741 100644
--- a/core/java/android/view/inputmethod/InputMethodSystemProperty.java
+++ b/core/java/android/view/inputmethod/InputMethodSystemProperty.java
@@ -17,7 +17,6 @@
 package android.view.inputmethod;
 
 import android.annotation.Nullable;
-import android.annotation.TestApi;
 import android.content.ComponentName;
 import android.os.Build;
 import android.os.SystemProperties;
@@ -27,7 +26,6 @@ import android.os.SystemProperties;
  *
  * @hide
  */
-@TestApi
 public class InputMethodSystemProperty {
     /**
      * System property key for the production use. The value must be either empty or a valid
@@ -78,6 +76,5 @@ public class InputMethodSystemProperty {
      *
      * @hide
      */
-    @TestApi
     public static final boolean MULTI_CLIENT_IME_ENABLED = (sMultiClientImeComponentName != null);
 }