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

Commit 6255caf9 authored by Hongwei Wang's avatar Hongwei Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove Activity if it enters PiP without window" into rvc-dev am: 81224e6f am: d6a9b807 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21564420



Change-Id: I208a16f400a8e34c28fb9d9805c1cf6646e6d973
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9efe6b8f d6a9b807

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

+6 −0
Original line number Diff line number Diff line
@@ -1294,6 +1294,12 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 
            }

            ensureActivityConfiguration(0 /* globalChanges */, PRESERVE_WINDOWS,

                    true /* ignoreVisibility */);

            if (inPictureInPictureMode && findMainWindow() == null) {

                // Prevent malicious app entering PiP without valid WindowState, which can in turn

                // result a non-touchable PiP window since the InputConsumer for PiP requires it.

                EventLog.writeEvent(0x534e4554, "265293293", -1, "");

                removeImmediately();

            }

        }

    }