From 314f1441da4447918af8d0af60a12c53ca8a78be Mon Sep 17 00:00:00 2001 From: ot904697 Date: Thu, 28 Jul 2022 14:01:17 +0800 Subject: [PATCH 1/5] Activity gain focus failed in InputMethodStressTest After the test is completed, the notification is not closed, so that subsequent test cannot get the focus. Close notification in tearDown to solve the issue. Bug: 241723484 Test: run InputMethodStressTest pass Change-Id: I876173e83488e18a884d8bc180f9681e726fff1d --- .../src/com/android/inputmethod/stresstest/NotificationTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java index 47f87d6d75fff..573b3b695a906 100644 --- a/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java +++ b/tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java @@ -102,6 +102,7 @@ public final class NotificationTest { @After public void tearDown() { mNotificationManager.cancelAll(); + mUiDevice.pressHome(); } @Test From 1f6323ddfbafacfbcda9e1b8a32214211db35728 Mon Sep 17 00:00:00 2001 From: Zixuan Qu Date: Tue, 27 Sep 2022 19:17:57 +0000 Subject: [PATCH 2/5] Add ABS_MT_SLOT config to virtual touch screen. Cherry-picked-from: ag/19908041 Bug: 244744917 Bug: 233960835 Bug: 233327669 Test: atest VirtualDeviceManagerServiceTest Change-Id: I58f0302e4df3415cff74646d7424c699d98cbca7 --- ..._android_server_companion_virtual_InputController.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/core/jni/com_android_server_companion_virtual_InputController.cpp b/services/core/jni/com_android_server_companion_virtual_InputController.cpp index 8197b67355d4a..daca1531d41ff 100644 --- a/services/core/jni/com_android_server_companion_virtual_InputController.cpp +++ b/services/core/jni/com_android_server_companion_virtual_InputController.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -271,6 +272,14 @@ static int openUinput(const char* readableName, jint vendorId, jint productId, c ALOGE("Error creating touchscreen uinput pressure axis: %s", strerror(errno)); return -errno; } + uinput_abs_setup slotAbsSetup; + slotAbsSetup.code = ABS_MT_SLOT; + slotAbsSetup.absinfo.maximum = MAX_POINTERS; + slotAbsSetup.absinfo.minimum = 0; + if (ioctl(fd, UI_ABS_SETUP, &slotAbsSetup) != 0) { + ALOGE("Error creating touchscreen uinput slots: %s", strerror(errno)); + return -errno; + } } if (ioctl(fd, UI_DEV_SETUP, &setup) != 0) { ALOGE("Error creating uinput device: %s", strerror(errno)); From 5c9a11c15f0da0ae54d9502833aba8495a603eb1 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 5 Oct 2022 18:32:55 -0700 Subject: [PATCH 3/5] Add new owner to the resume-on-reboot module. Test: Adding owners. No code change. Change-Id: I5af32f68652d5854e6a99b59f2f56fcaac575588 (cherry picked from commit 8c8d787bc66920fb62188a23a09fcd9641219cfb) Merged-In: I5af32f68652d5854e6a99b59f2f56fcaac575588 --- core/java/android/service/resumeonreboot/OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/android/service/resumeonreboot/OWNERS b/core/java/android/service/resumeonreboot/OWNERS index 3a127d5a2c12c..8ffb76a69923d 100644 --- a/core/java/android/service/resumeonreboot/OWNERS +++ b/core/java/android/service/resumeonreboot/OWNERS @@ -1,2 +1,2 @@ -xunchang@google.com -zhaojiac@google.com +aveena@google.com +ejyzhang@google.com \ No newline at end of file From a59717162528043e597e66be098619a369e18684 Mon Sep 17 00:00:00 2001 From: "derek.li" Date: Thu, 20 Oct 2022 16:22:32 +0800 Subject: [PATCH 4/5] [PATCH] Don't report after view detached from window. Check window view is not null in reportKeepClearAreasChanged Bug: 254586205 Test: CtsAutoFillServiceTestCases Change-Id: I0db582c6f73e2a0602bfb2968e2b10536b5242d5 --- core/java/android/view/ViewRootImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index e46e44b4115b3..2bb984899f9c4 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -4848,7 +4848,7 @@ public final class ViewRootImpl implements ViewParent, } void reportKeepClearAreasChanged() { - if (!mHasPendingKeepClearAreaChange) { + if (!mHasPendingKeepClearAreaChange || mView == null) { return; } mHasPendingKeepClearAreaChange = false; From 483f02cf02bbafadf1bac83f63b3383844c83b55 Mon Sep 17 00:00:00 2001 From: Eric Zhang Date: Wed, 5 Oct 2022 18:32:55 -0700 Subject: [PATCH 5/5] Add new owner to the resume-on-reboot module. Test: Adding owners. No code change. Change-Id: I5af32f68652d5854e6a99b59f2f56fcaac575588 (cherry picked from commit 8c8d787bc66920fb62188a23a09fcd9641219cfb) Merged-In: I5af32f68652d5854e6a99b59f2f56fcaac575588 (cherry picked from commit 5c9a11c15f0da0ae54d9502833aba8495a603eb1) Merged-In: I5af32f68652d5854e6a99b59f2f56fcaac575588 --- core/java/android/service/resumeonreboot/OWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/core/java/android/service/resumeonreboot/OWNERS b/core/java/android/service/resumeonreboot/OWNERS index 721fbaf2d4ed1..8ffb76a69923d 100644 --- a/core/java/android/service/resumeonreboot/OWNERS +++ b/core/java/android/service/resumeonreboot/OWNERS @@ -1 +1,2 @@ +aveena@google.com ejyzhang@google.com \ No newline at end of file