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

Commit b1126c72 authored by Adrian Roos's avatar Adrian Roos
Browse files

IMM: remove obsolete test-only flag 

Removes a flag that was controlling @TestApi only.

Flag: TEST_ONLY
Change-Id: Ie6709b0f8c03218b1b663ba763bf0d64cdba05b5
parent b0133d13

core/api/test-current.txt

+3 −3
Original line number Diff line number Diff line
@@ -3989,15 +3989,15 @@ package android.view.inputmethod { 
    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void addVirtualStylusIdForTestSession();

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void finishTrackingPendingImeVisibilityRequests();

    method public int getDisplayId();

    method @FlaggedApi("android.view.inputmethod.imm_userhandle_hostsidetests") @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodInfo> getEnabledInputMethodListAsUser(@NonNull android.os.UserHandle);

    method @FlaggedApi("android.view.inputmethod.imm_userhandle_hostsidetests") @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodSubtype> getEnabledInputMethodSubtypeListAsUser(@NonNull String, boolean, @NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodInfo> getEnabledInputMethodListAsUser(@NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodSubtype> getEnabledInputMethodSubtypeListAsUser(@NonNull String, boolean, @NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public java.util.List<android.view.inputmethod.InputMethodInfo> getInputMethodListAsUser(int);

    method public boolean hasActiveInputConnection(@Nullable android.view.View);

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean hasPendingImeVisibilityRequests();

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void hideSoftInputFromServerForTest();

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean isCurrentRootView(@NonNull android.view.View);

    method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public boolean isInputMethodPickerShown();

    method @FlaggedApi("android.view.inputmethod.imm_userhandle_hostsidetests") @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public boolean isStylusHandwritingAvailableAsUser(@NonNull android.os.UserHandle);

    method @NonNull @RequiresPermission(value=android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional=true) public boolean isStylusHandwritingAvailableAsUser(@NonNull android.os.UserHandle);

    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

  }

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

+0 −3
Original line number Diff line number Diff line
@@ -1671,7 +1671,6 @@ public final class InputMethodManager { 
    @NonNull

    @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)

    @TestApi

    @FlaggedApi(Flags.FLAG_IMM_USERHANDLE_HOSTSIDETESTS)

    @SuppressLint("UserHandle")

    public boolean isStylusHandwritingAvailableAsUser(@NonNull UserHandle user) {

        final Context fallbackContext = ActivityThread.currentApplication();
@@ -1816,7 +1815,6 @@ public final class InputMethodManager { 
    @NonNull

    @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)

    @TestApi

    @FlaggedApi(Flags.FLAG_IMM_USERHANDLE_HOSTSIDETESTS)

    @SuppressLint("UserHandle")

    public List<InputMethodInfo> getEnabledInputMethodListAsUser(@NonNull UserHandle user) {

        return IInputMethodManagerGlobalInvoker.getEnabledInputMethodList(user.getIdentifier());
@@ -1858,7 +1856,6 @@ public final class InputMethodManager { 
    @NonNull

    @RequiresPermission(value = Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)

    @TestApi

    @FlaggedApi(Flags.FLAG_IMM_USERHANDLE_HOSTSIDETESTS)

    @SuppressLint("UserHandle")

    public List<InputMethodSubtype> getEnabledInputMethodSubtypeListAsUser(

            @NonNull String imeId, boolean allowsImplicitlyEnabledSubtypes,