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 am: 919fd6e0a1

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

Change-Id: Ie12bf16c61d1655b95f0252d8692fe634200f1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Samip Garg
2023-01-16 04:00:03 +00:00
committed by Automerger Merge Worker
parent cd847d1df4 919fd6e0a1
commit ad5630b9eb
3 changed files with 3 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

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

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