Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc3ef629 authored by Evan Rosky's avatar Evan Rosky
Browse files

Check if recents exists before trying to relz to it 

In some situations (SUW) recents doesn't exist at the time of the
gesture. In these situations, don't try to reference it.

Bug: 205062356
Test: Dismiss AllSetActivity via swipe-up in SUW, observe no crash
Change-Id: I3f1bfd04cfa4874475cd6d033376f24cb5b192a7
parent 5d39efec

services/core/java/com/android/server/wm/InputMonitor.java

+10 −6
Original line number Diff line number Diff line
@@ -497,13 +497,17 @@ final class InputMonitor { 


            resetInputConsumers(mInputTransaction);

            // Update recents input consumer layer if active

            if (mAddRecentsAnimationInputConsumerHandle

                    && getWeak(mActiveRecentsActivity) != null) {

                final WindowContainer layer = getWeak(mActiveRecentsLayerRef);

                mRecentsAnimationInputConsumer.show(mInputTransaction,

                        layer != null ? layer : getWeak(mActiveRecentsActivity));

            final ActivityRecord activeRecents = getWeak(mActiveRecentsActivity);

            if (mAddRecentsAnimationInputConsumerHandle && activeRecents != null

                    && activeRecents.getSurfaceControl() != null) {

                WindowContainer layer = getWeak(mActiveRecentsLayerRef);

                layer = layer != null ? layer : activeRecents;

                // Handle edge-case for SUW where windows don't exist yet

                if (layer.getSurfaceControl() != null) {

                    mRecentsAnimationInputConsumer.show(mInputTransaction, layer);

                    mAddRecentsAnimationInputConsumerHandle = false;

                }

            }

            mDisplayContent.forAllWindows(this, true /* traverseTopToBottom */);

            updateInputFocusRequest(mRecentsAnimationInputConsumer);