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

Merge "Add support for Input ads from the SDK runtime." into udc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2023-05-10 10:07:10 +00:00
committed by Android (Google) Code Review
parent f60e7025e5 5ee254bf11
commit e0fe75c325
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/inputmethod/InputMethodUtils.java
View File

@@ -194,8 +194,8 @@ final class InputMethodUtils {
int uid, String packageName) { int uid, String packageName) {
// PackageManagerInternal#getPackageUid() doesn't check MATCH_INSTANT/MATCH_APEX as of // PackageManagerInternal#getPackageUid() doesn't check MATCH_INSTANT/MATCH_APEX as of
// writing. So setting 0 should be fine. // writing. So setting 0 should be fine.
return packageManagerInternal.getPackageUid(packageName, 0 /* flags */, return packageManagerInternal.isSameApp(packageName, /* flags= */ 0, uid,
UserHandle.getUserId(uid)) == uid; UserHandle.getUserId(uid));
} }
/** /**

2
services/tests/InputMethodSystemServerTests/src/com/android/server/inputmethod/InputMethodManagerServiceTestBase.java
View File

@@ -207,6 +207,8 @@ public class InputMethodManagerServiceTestBase {
when(mMockActivityManagerInternal.isSystemReady()).thenReturn(true); when(mMockActivityManagerInternal.isSystemReady()).thenReturn(true);
when(mMockPackageManagerInternal.getPackageUid(anyString(), anyLong(), anyInt())) when(mMockPackageManagerInternal.getPackageUid(anyString(), anyLong(), anyInt()))
.thenReturn(Binder.getCallingUid()); .thenReturn(Binder.getCallingUid());
when(mMockPackageManagerInternal.isSameApp(anyString(), anyLong(), anyInt(), anyInt()))
.thenReturn(true);
when(mMockWindowManagerInternal.onToggleImeRequested(anyBoolean(), any(), any(), anyInt())) when(mMockWindowManagerInternal.onToggleImeRequested(anyBoolean(), any(), any(), anyInt()))
.thenReturn(TEST_IME_TARGET_INFO); .thenReturn(TEST_IME_TARGET_INFO);
when(mMockInputMethodClient.asBinder()).thenReturn(mMockInputMethodBinder); when(mMockInputMethodClient.asBinder()).thenReturn(mMockInputMethodBinder);