| commit | 5af03c7fcfb129f75fe59839c48a53f1b00d25c1 | [log] [tgz] |
|---|---|---|
| author | Tracy Zhou <tracyzhou@google.com> | Fri Apr 01 18:56:29 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 01 18:56:29 2022 +0000 |
| tree | 6638dd8db362c7130fa8ef05919ea0c88e7993a2 | |
| parent | b864ca924b71fa4361dbb0403e25e2819a24da9e [diff] | |
| parent | ce0ada92a38a08ee45b3a082b67270f4444355d0 [diff] |
Merge "Fix npe in FrameHandler" into tm-dev am: 76a99eccc0 am: ce0ada92a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17534537 Change-Id: I96fa0489a9963c3ef0e23e2ec553781a6dc9ad60 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/quickstep/src/com/android/quickstep/ViewUtils.java b/quickstep/src/com/android/quickstep/ViewUtils.java index ab26d15..1fef544 100644 --- a/quickstep/src/com/android/quickstep/ViewUtils.java +++ b/quickstep/src/com/android/quickstep/ViewUtils.java
@@ -83,7 +83,7 @@ } private boolean schedule() { - if (mViewRoot.getView() != null) { + if (mViewRoot != null && mViewRoot.getView() != null) { mViewRoot.registerRtFrameCallback(this); mViewRoot.getView().invalidate(); return true;