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

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

Change-Id: I2cba7ffebe414844ceb1afd131c842e42276b2bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

@@ -1296,6 +1296,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();
+            }
         }
     }