Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2022-07-20 06:29:08 +00:00
committed by Android (Google) Code Review
parent b5f8526c88 1fb9a87bdb
commit fadc810a48
4 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/view/inputmethod/IInputMethodManagerInvoker.java
View File

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

6
core/java/android/view/inputmethod/InputMethodManager.java
View File

@@ -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);
}
/**

6
core/java/com/android/internal/view/IInputMethodManager.aidl
View File

@@ -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 = "

16
services/core/java/com/android/server/inputmethod/InputMethodManagerService.java
View File

@@ -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) {