From 903574217bfe99de0ca7244d26aa5f90d0ae5f13 Mon Sep 17 00:00:00 2001 From: Vaibhav Devmurari Date: Mon, 20 Feb 2023 19:16:55 +0000 Subject: Fix KeyboardLayoutTest and support multi-user CTS testing Always run as SYSTEM to prevent cts failures when the current user isn't user 0 Test: atest KeyboardLayoutTest Test: atest KeyboardLayoutManagerTests Bug: 268571576 Bug: 263752542 Change-Id: I67b7bf9b3a07ac5533496f89e0dab3582a519b76 --- .../core/java/com/android/server/input/KeyboardLayoutManager.java | 4 ++-- .../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 9e8b9f15a7c5..67fc12ceb244 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) -- cgit v1.2.3-59-g8ed1b