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

Commit 919fd6e0 authored by Samip Garg's avatar Samip Garg Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib30a6a1566244db37f77e650fcb7db4998f21d11
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bc9acffe 100335fd

core/java/android/service/resumeonreboot/OWNERS

+1 −0
Original line number Diff line number Diff line 
aveena@google.com

ejyzhang@google.com
 
 No newline at end of file

core/java/android/view/ViewRootImpl.java

+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;

services/core/jni/com_android_server_companion_virtual_InputController.cpp

+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));

tests/InputMethodStressTest/src/com/android/inputmethod/stresstest/NotificationTest.java

+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