summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Winson Chung <winsonc@google.com> 2017-03-20 14:01:36 -0700
committer Winson Chung <winsonc@google.com> 2017-03-20 14:01:36 -0700
commitccbc4b903414548933bdc1e84a7fbf3973b24ecd (patch)
tree3926a5982f2302bc595bfae45ebaa510df3fc84d
parentd7bc388f30c89e7819d7a0b0999df8b0324289c8 (diff)
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
-rw-r--r--packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java2
1 files changed, 1 insertions, 1 deletions
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 2f9c3fc3368a..2916c857ff16 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();