Merge "Snap tm-dev to android13-tests-dev" into tm-dev (100335fd) · Commits · e / os / android_frameworks_base

core/java/android/service/resumeonreboot/OWNERS

+1 −0

+1 −1

Original line number	Diff line number	Diff line
		@@ -4856,7 +4856,7 @@ public final class ViewRootImpl implements ViewParent,
		}

		void reportKeepClearAreasChanged() {
		if (!mHasPendingKeepClearAreaChange) {
		if (!mHasPendingKeepClearAreaChange \|\| mView == null) {
		return;
		}
		mHasPendingKeepClearAreaChange = false;

+9 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <android/keycodes.h>
		#include <errno.h>
		#include <fcntl.h>
		#include <input/Input.h>
		#include <linux/uinput.h>
		#include <math.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));
		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));

+1 −0

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

		@Test