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

Commit ad5630b9 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 am: 919fd6e0 

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



Change-Id: Ie12bf16c61d1655b95f0252d8692fe634200f1f9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cd847d1d 919fd6e0

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
@@ -5045,7 +5045,7 @@ public final class ViewRootImpl implements ViewParent, 
    }



    void reportKeepClearAreasChanged() {

        if (!mHasPendingKeepClearAreaChange) {

        if (!mHasPendingKeepClearAreaChange || mView == null) {

            return;

        }

        mHasPendingKeepClearAreaChange = false;

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