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

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

Change-Id: I707ee5856d28f823559d3e8d3e43e5803685ca6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Hongwei Wang
2023-03-04 06:29:50 +00:00
committed by Automerger Merge Worker

View File

@@ -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();
}
}
}