| commit | 68a196f1ba7f0e9388865e96d4ca82d1a8cbe9bc | [log] [tgz] |
|---|---|---|
| author | Robert Horvath <robhor@google.com> | Thu Oct 27 08:34:02 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 27 08:34:02 2022 +0000 |
| tree | 6d0cc28b25b06410d317d567d1652883e4960cea | |
| parent | ab831a600018444970bc1c48e2c1076c53d1c5ed [diff] | |
| parent | 28951b551e1af101ea8279d57d1d4e557a1d4ef2 [diff] |
Merge "[PATCH] Don't report after view detached from window." am: 88749cfd8f am: 698a7836d2 am: 28951b551e Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2262742 Change-Id: Ifd30343b0768153c0a165806995f06e29d6a70c9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 5e836ef..ff4588a 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java
@@ -4970,7 +4970,7 @@ } void reportKeepClearAreasChanged() { - if (!mHasPendingKeepClearAreaChange) { + if (!mHasPendingKeepClearAreaChange || mView == null) { return; } mHasPendingKeepClearAreaChange = false;