Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e28f06fa authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

Merge "Expose getInputMethodListAsUser as a testAPI" into sc-dev am: e519be1e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13776610

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebfbf57c9d7374737b41637c44acd313d3b3d172
parents 528cd9f4 e519be1e

core/api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2736,6 +2736,7 @@ package android.view.inputmethod { 


  public final class InputMethodManager {

    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();

  }

core/java/android/view/inputmethod/InputMethodManager.java

+2 −0
Original line number Diff line number Diff line
@@ -1308,7 +1308,9 @@ public final class InputMethodManager { 
     * @return {@link List} of {@link InputMethodInfo}.

     * @hide

     */

    @TestApi

    @RequiresPermission(INTERACT_ACROSS_USERS_FULL)

    @NonNull

    public List<InputMethodInfo> getInputMethodListAsUser(@UserIdInt int userId) {

        try {

            final Completable.InputMethodInfoList value = Completable.createInputMethodInfoList();