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

Commit fadc810a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Merge IInputMethodManager#get{,AwareLocked}InputMethodList"

parents b5f8526c 1fb9a87b

core/java/android/view/inputmethod/IInputMethodManagerInvoker.java

+2 −12
Original line number Diff line number Diff line
@@ -68,20 +68,10 @@ final class IInputMethodManagerInvoker { 


    @AnyThread

    @NonNull

    List<InputMethodInfo> getInputMethodList(@UserIdInt int userId) {

        try {

            return mTarget.getInputMethodList(userId);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

    }



    @AnyThread

    @NonNull

    List<InputMethodInfo> getAwareLockedInputMethodList(@UserIdInt int userId,

    List<InputMethodInfo> getInputMethodList(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        try {

            return mTarget.getAwareLockedInputMethodList(userId, directBootAwareness);

            return mTarget.getInputMethodList(userId, directBootAwareness);

        } catch (RemoteException e) {

            throw e.rethrowFromSystemServer();

        }

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

+3 −3
Original line number Diff line number Diff line
@@ -1404,7 +1404,7 @@ public final class InputMethodManager { 
        // We intentionally do not use UserHandle.getCallingUserId() here because for system

        // services InputMethodManagerInternal.getInputMethodListAsUser() should be used

        // instead.

        return mServiceInvoker.getInputMethodList(UserHandle.myUserId());

        return mServiceInvoker.getInputMethodList(UserHandle.myUserId(), DirectBootAwareness.AUTO);

    }



    /**
@@ -1452,7 +1452,7 @@ public final class InputMethodManager { 
    @RequiresPermission(INTERACT_ACROSS_USERS_FULL)

    @NonNull

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

        return mServiceInvoker.getInputMethodList(userId);

        return mServiceInvoker.getInputMethodList(userId, DirectBootAwareness.AUTO);

    }



    /**
@@ -1468,7 +1468,7 @@ public final class InputMethodManager { 
    @NonNull

    public List<InputMethodInfo> getInputMethodListAsUser(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        return mServiceInvoker.getAwareLockedInputMethodList(userId, directBootAwareness);

        return mServiceInvoker.getInputMethodList(userId, directBootAwareness);

    }



    /**

core/java/com/android/internal/view/IInputMethodManager.aidl

+1 −5
Original line number Diff line number Diff line
@@ -38,11 +38,7 @@ interface IInputMethodManager { 
    // TODO: Use ParceledListSlice instead

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)")

    List<InputMethodInfo> getInputMethodList(int userId);



    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

            + "android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, conditional = true)")

    List<InputMethodInfo> getAwareLockedInputMethodList(int userId, int directBootAwareness);

    List<InputMethodInfo> getInputMethodList(int userId, int directBootAwareness);



    // TODO: Use ParceledListSlice instead

    @JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "

services/core/java/com/android/server/inputmethod/InputMethodManagerService.java

+4 −12
Original line number Diff line number Diff line
@@ -2065,7 +2065,10 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
        return true;

    }



    private List<InputMethodInfo> getInputMethodListInternal(@UserIdInt int userId,

    @BinderThread

    @NonNull

    @Override

    public List<InputMethodInfo> getInputMethodList(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        if (UserHandle.getCallingUserId() != userId) {

            mContext.enforceCallingPermission(
@@ -2086,17 +2089,6 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub 
        }

    }



    @Override

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

        return getInputMethodListInternal(userId, DirectBootAwareness.AUTO);

    }



    @Override

    public List<InputMethodInfo> getAwareLockedInputMethodList(@UserIdInt int userId,

            @DirectBootAwareness int directBootAwareness) {

        return getInputMethodListInternal(userId, directBootAwareness);

    }



    @Override

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

        if (UserHandle.getCallingUserId() != userId) {