diff options
| -rw-r--r-- | core/api/test-current.txt | 5 | ||||
| -rw-r--r-- | core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/inputmethod/InputMethodManager.java | 1 | ||||
| -rw-r--r-- | core/res/AndroidManifest.xml | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/core/api/test-current.txt b/core/api/test-current.txt index 6e8713413d68..9c1a55b84ca5 100644 --- a/core/api/test-current.txt +++ b/core/api/test-current.txt @@ -47,6 +47,7 @@ package android { field public static final String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT"; field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS"; field public static final String TEST_BIOMETRIC = "android.permission.TEST_BIOMETRIC"; + field public static final String TEST_INPUT_METHOD = "android.permission.TEST_INPUT_METHOD"; field public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS"; field public static final String UPGRADE_RUNTIME_PERMISSIONS = "android.permission.UPGRADE_RUNTIME_PERMISSIONS"; field public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG"; @@ -3160,8 +3161,8 @@ package android.view.inputmethod { method public int getDisplayId(); method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public java.util.List<android.view.inputmethod.InputMethodInfo> getInputMethodListAsUser(int); method public boolean hasActiveInputConnection(@Nullable android.view.View); - method public boolean isInputMethodPickerShown(); - method @RequiresPermission("android.permission.TEST_INPUT_METHOD") public void setStylusWindowIdleTimeoutForTest(long); + method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean isInputMethodPickerShown(); + method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void setStylusWindowIdleTimeoutForTest(long); field public static final long CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING = 214016041L; // 0xcc1a029L } diff --git a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java index aeff37c67444..7f859d6b4bf4 100644 --- a/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java +++ b/core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java @@ -16,6 +16,7 @@ package android.view.inputmethod; +import android.Manifest; import android.annotation.AnyThread; import android.annotation.DurationMillisLong; import android.annotation.NonNull; @@ -353,6 +354,7 @@ final class IInputMethodManagerGlobalInvoker { } @AnyThread + @RequiresPermission(Manifest.permission.TEST_INPUT_METHOD) static boolean isInputMethodPickerShownForTest() { final IInputMethodManager service = getService(); if (service == null) { diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 1697bf8bcf7b..eb72405b3051 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -3465,6 +3465,7 @@ public final class InputMethodManager { * @hide */ @TestApi + @RequiresPermission(Manifest.permission.TEST_INPUT_METHOD) public boolean isInputMethodPickerShown() { return IInputMethodManagerGlobalInvoker.isInputMethodPickerShownForTest(); } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 953ea898fcf9..d8ecb5c65384 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -4133,7 +4133,8 @@ android:protectionLevel="signature" /> <!-- Allows access to Test APIs defined in {@link android.view.inputmethod.InputMethodManager}. - @hide --> + @hide + @TestApi --> <permission android:name="android.permission.TEST_INPUT_METHOD" android:protectionLevel="signature" /> |