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

Commit 81224e6f authored by Hongwei Wang's avatar Hongwei Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove Activity if it enters PiP without window" into rvc-dev

parents 931093df 4fad1456
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -1200,6 +1200,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();
            }
        }
    }