From ccbc4b903414548933bdc1e84a7fbf3973b24ecd Mon Sep 17 00:00:00 2001
From: Winson Chung <winsonc@google.com>
Date: Mon, 20 Mar 2017 14:01:36 -0700
Subject: [PATCH] Ensure that we update the controller before setting menu
 visibility.

Bug: 36444329
Test: Launch PIP with media session, expand to see menu
Change-Id: I8ca4d459a2989c93c4300ac687dce298f4233822
---
 .../src/com/android/systemui/pip/phone/PipMenuActivity.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
index 2f9c3fc3368a9..2916c857ff16c 100644
--- a/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
@@ -172,7 +172,6 @@ public class PipMenuActivity extends Activity {
 
         updateFromIntent(getIntent());
         setTitle(R.string.pip_menu_title);
-        notifyActivityCallback(mMessenger);
     }
 
     @Override
@@ -304,6 +303,7 @@ public class PipMenuActivity extends Activity {
 
     private void updateFromIntent(Intent intent) {
         mToControllerMessenger = intent.getParcelableExtra(EXTRA_CONTROLLER_MESSENGER);
+        notifyActivityCallback(mMessenger);
         ParceledListSlice actions = intent.getParcelableExtra(EXTRA_ACTIONS);
         if (actions != null) {
             mActions.clear();