| commit | bc230e4a423556f5eabed6fd4222cb4ab7cb396c | [log] [tgz] |
|---|---|---|
| author | Winson Chung <winsonc@google.com> | Thu Mar 25 00:11:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 25 00:11:22 2021 +0000 |
| tree | 2fcbb6334c373e483f04f1fdfc6a2bda9ffbd392 | |
| parent | 4d32f5a74df2ec4c6659c3f685e45a248a17603c [diff] | |
| parent | 394ede6fe6e3694fb0718c59d526b58e7748c6f5 [diff] |
Merge "Fix activity NPE when clearing flags" into sc-dev am: 394ede6fe6 Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13985350 Change-Id: Id28acf8435380e779d7771062b4d280d67957362
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java index 335d470..d357ebe 100644 --- a/quickstep/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -3152,7 +3152,9 @@ MAIN_EXECUTOR.execute(() -> { // Needed for activities that auto-enter PiP, which will not trigger a remote // animation to be created - mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS); + if (mActivity != null) { + mActivity.clearForceInvisibleFlag(STATE_HANDLER_INVISIBILITY_FLAGS); + } }); } }