Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ebd1e50 authored by Vaibhav Devmurari's avatar Vaibhav Devmurari Committed by Automerger Merge Worker
Browse files

Merge "Fix KeyboardLayoutTest and support multi-user CTS testing" into udc-dev am: c57d646a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21511572



Change-Id: I8e1123cb36d790bb1edd4b405001b7117caf2f3c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 72520d26 c57d646a

services/core/java/com/android/server/input/KeyboardLayoutManager.java

+2 −2
Original line number Diff line number Diff line
@@ -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);

services/tests/servicestests/src/com/android/server/input/KeyboardLayoutManagerTests.kt

+2 −2
Original line number Diff line number Diff line
@@ -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)