diff options
| author | 2023-02-23 15:01:59 +0000 | |
|---|---|---|
| committer | 2023-02-23 15:01:59 +0000 | |
| commit | c57d646aa7d37c4682ef016f442548ba9b115c1b (patch) | |
| tree | 78166b7056a935d54f94fa39f121f2ad88a302a3 | |
| parent | 9dc072f38a9d376b875339c5a2335496c90ac19a (diff) | |
| parent | 903574217bfe99de0ca7244d26aa5f90d0ae5f13 (diff) | |
Merge "Fix KeyboardLayoutTest and support multi-user CTS testing" into udc-dev
| -rw-r--r-- | services/core/java/com/android/server/input/KeyboardLayoutManager.java | 4 | ||||
| -rw-r--r-- | services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/services/core/java/com/android/server/input/KeyboardLayoutManager.java b/services/core/java/com/android/server/input/KeyboardLayoutManager.java index 5358185374e9..e0253fc3d30c 100644 --- a/services/core/java/com/android/server/input/KeyboardLayoutManager.java +++ b/services/core/java/com/android/server/input/KeyboardLayoutManager.java @@ -343,9 +343,9 @@ final class KeyboardLayoutManager implements InputManager.InputDeviceListener { private void visitAllKeyboardLayouts(KeyboardLayoutVisitor visitor) { final PackageManager pm = mContext.getPackageManager(); Intent intent = new Intent(InputManager.ACTION_QUERY_KEYBOARD_LAYOUTS); - for (ResolveInfo resolveInfo : pm.queryBroadcastReceivers(intent, + for (ResolveInfo resolveInfo : pm.queryBroadcastReceiversAsUser(intent, PackageManager.GET_META_DATA | PackageManager.MATCH_DIRECT_BOOT_AWARE - | PackageManager.MATCH_DIRECT_BOOT_UNAWARE)) { + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE, UserHandle.USER_SYSTEM)) { final ActivityInfo activityInfo = resolveInfo.activityInfo; final int priority = resolveInfo.priority; visitKeyboardLayoutsInPackage(pm, activityInfo, null, priority, visitor); diff --git a/services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt b/services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt index 34540c398deb..b2bfd2bf720c 100644 --- a/services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt +++ b/services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt @@ -167,8 +167,8 @@ class KeyboardLayoutManagerTests { Mockito.`when`(context.packageManager).thenReturn(packageManager) val info = createMockReceiver() - Mockito.`when`(packageManager.queryBroadcastReceivers(Mockito.any(), Mockito.anyInt())) - .thenReturn(listOf(info)) + Mockito.`when`(packageManager.queryBroadcastReceiversAsUser(Mockito.any(), Mockito.anyInt(), + Mockito.anyInt())).thenReturn(listOf(info)) Mockito.`when`(packageManager.getReceiverInfo(Mockito.any(), Mockito.anyInt())) .thenReturn(info.activityInfo) |