commit 171a9eb04bd018e4f483a51fcbdcb0d15a41be33
author lumark <lumark@google.com> Tue Jun 18 05:53:38 2019 -0700
committer android-build-merger <android-build-merger@google.com> Tue Jun 18 05:53:38 2019 -0700
tree 7332df4ceca98c0d64120ec4bca56e85d2f6ac53
parent c58dbb4044481ae7003235ff1c9d2f0f2ae1637f
parent 6533a696893c8ef1d49f8e86d026925d73302316

Merge "Merge "Make InputMethodSystemProperty#MULTI_CLIENT_IME_ENABLED testable." into qt-dev am: b7abebde5b am: c0ecccca16" into qt-r1-dev-plus-aosp
am: 6533a69689

Change-Id: Ibea62abfce411333b3eb9b7cc0bf0876c065e67e

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index c787bfa..0127dfe 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -3473,6 +3473,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);
 
     /**