Merge "PiP: Safeguard in calling on menu view in case it's not created."

2020-11-24 19:10:09 +00:00
parent bede6db216 645e988e1d
commit 298aecf474
1 changed files with 3 additions and 1 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuActivityController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/phone/PipMenuActivityController.java
@@ -239,7 +239,9 @@ public class PipMenuActivityController {
                    + " callers=\n" + Debug.getCallers(5, "    "));
        }

-        maybeCreateSyncApplier();
+        if (!maybeCreateSyncApplier()) {
+            return;
+        }

        mPipMenuView.showMenu(menuState, stackBounds, allowMenuTimeout, willResizeMenu, withDelay,
                showResizeHandle);