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: Ie684c1fbfb72cc3a20af17ed7dd435984cadf400
2021-03-25 00:02:15 +00:00
parent 0a083239eb 394ede6fe6
commit cf0d2c8191
1 changed files with 3 additions and 1 deletions
@@ -3152,7 +3152,9 @@ public abstract class RecentsView<T extends StatefulActivity> extends PagedView
            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);
+                }
            });
        }
    }