commit cf48a8e8284b157708f3b290019e0bc0e208ffa6
author lumark <lumark@google.com> Tue Jun 18 05:32:30 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 18 05:32:30 2019 -0700
tree 68127b9379cf7aabf62a24f90065ebce2ba644c7
parent 61cd00fd156c63f0880b9675f4e4927a962de8fb
parent b7abebde5b1e3c36a13046dc5cabd7491806d8c6

Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev
am: b7abebde5b

Change-Id: I2224102556d110021150ddb6eea90bb0be2c2f36

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index 15d5c8f..931cafa 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3474,6 +3474,11 @@
     method public boolean isInputMethodPickerShown();
   }
 
+  public class InputMethodSystemProperty {
+    ctor public InputMethodSystemProperty();
+    field public static final boolean MULTI_CLIENT_IME_ENABLED;
+  }
+
 }
 
 package android.view.inspector {

core/java/android/view/inputmethod/InputMethodSystemProperty.java

diff --git a/core/java/android/view/inputmethod/InputMethodSystemProperty.java b/core/java/android/view/inputmethod/InputMethodSystemProperty.java
index 7c79d44..05143a1 100644
--- a/core/java/android/view/inputmethod/InputMethodSystemProperty.java
+++ b/core/java/android/view/inputmethod/InputMethodSystemProperty.java
@@ -17,6 +17,7 @@
 package android.view.inputmethod;
 
 import android.annotation.Nullable;
+import android.annotation.TestApi;
 import android.content.ComponentName;
 import android.os.Build;
 import android.os.SystemProperties;
@@ -26,6 +27,7 @@
  *
  * @hide
  */
+@TestApi
 public class InputMethodSystemProperty {
     /**
      * System property key for the production use. The value must be either empty or a valid
@@ -87,6 +89,7 @@
      *
      * @hide
      */
+    @TestApi
     public static final boolean MULTI_CLIENT_IME_ENABLED = (sMultiClientImeComponentName != null);
 
     /**