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

Merge "Snap tm-dev to android13-tests-dev" into tm-dev am: 100335fdc7

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

Change-Id: Ib30a6a1566244db37f77e650fcb7db4998f21d11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Samip Garg
2023-01-11 15:14:41 +00:00
committed by Automerger Merge Worker
parent bc9acffea9 100335fdc7
commit 919fd6e0a1
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/java/android/service/resumeonreboot/OWNERS
View File

@@ -1 +1,2 @@
aveena@google.com
ejyzhang@google.com ejyzhang@google.com

2
core/java/android/view/ViewRootImpl.java
View File

@@ -4856,7 +4856,7 @@ public final class ViewRootImpl implements ViewParent,
} }
void reportKeepClearAreasChanged() { void reportKeepClearAreasChanged() {
if (!mHasPendingKeepClearAreaChange) { if (!mHasPendingKeepClearAreaChange || mView == null) {
return; return;
} }
mHasPendingKeepClearAreaChange = false; mHasPendingKeepClearAreaChange = false;

9
services/core/jni/com_android_server_companion_virtual_InputController.cpp
View File

@@ -21,6 +21,7 @@
#include <android/keycodes.h> #include <android/keycodes.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <input/Input.h>
#include <linux/uinput.h> #include <linux/uinput.h>
#include <math.h> #include <math.h>
#include <nativehelper/JNIHelp.h> #include <nativehelper/JNIHelp.h>
@@ -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)); ALOGE("Error creating touchscreen uinput pressure axis: %s", strerror(errno));
return -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) { if (ioctl(fd, UI_DEV_SETUP, &setup) != 0) {
ALOGE("Error creating uinput device: %s", strerror(errno)); ALOGE("Error creating uinput device: %s", strerror(errno));

1
tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java
View File

@@ -102,6 +102,7 @@ public final class NotificationTest {
@After @After
public void tearDown() { public void tearDown() {
mNotificationManager.cancelAll(); mNotificationManager.cancelAll();
mUiDevice.pressHome();
} }
@Test @Test