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

Merge "Require TEST_INPUT_METHOD instead in IMM#addVirtualStylusIdForTestSession()"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-01 17:57:00 +00:00
committed by Android (Google) Code Review
parent 59eec43b74 cba800ef2f
commit d6ffb3b531
5 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/test-current.txt
View File

@@ -3157,7 +3157,7 @@ package android.view.inputmethod {
}
public final class InputMethodManager {
method public void addVirtualStylusIdForTestSession();
method @RequiresPermission(android.Manifest.permission.TEST_INPUT_METHOD) public void addVirtualStylusIdForTestSession();
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);

1
core/java/android/view/inputmethod/IInputMethodManagerGlobalInvoker.java
View File

@@ -489,6 +489,7 @@ final class IInputMethodManagerGlobalInvoker {
}
@AnyThread
@RequiresPermission(Manifest.permission.TEST_INPUT_METHOD)
static void addVirtualStylusIdForTestSession(IInputMethodClient client) {
final IInputMethodManager service = getService();
if (service == null) {

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

@@ -2596,6 +2596,7 @@ public final class InputMethodManager {
* @hide
*/
@TestApi
@RequiresPermission(Manifest.permission.TEST_INPUT_METHOD)
public void addVirtualStylusIdForTestSession() {
synchronized (mH) {
IInputMethodManagerGlobalInvoker.addVirtualStylusIdForTestSession(mClient);

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

@@ -147,9 +147,9 @@ interface IInputMethodManager {
boolean isStylusHandwritingAvailableAsUser(int userId);
/** add virtual stylus id for test Stylus handwriting session **/
@EnforcePermission("INJECT_EVENTS")
@EnforcePermission("TEST_INPUT_METHOD")
@JavaPassthrough(annotation="@android.annotation.RequiresPermission(value = "
+ "android.Manifest.permission.INJECT_EVENTS)")
+ "android.Manifest.permission.TEST_INPUT_METHOD)")
void addVirtualStylusIdForTestSession(in IInputMethodClient client);
/** Set a stylus idle-timeout after which handwriting {@code InkWindow} will be removed. */

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

@@ -4413,7 +4413,7 @@ public final class InputMethodManagerService extends IInputMethodManager.Stub
* a stylus deviceId is not already registered on device.
*/
@BinderThread
@EnforcePermission(Manifest.permission.INJECT_EVENTS)
@EnforcePermission(Manifest.permission.TEST_INPUT_METHOD)
@Override
public void addVirtualStylusIdForTestSession(IInputMethodClient client) {
int uid = Binder.getCallingUid();