Merge "Ensure that we update the controller before setting menu visibility."

2017-03-20 22:56:18 +00:00
parent 2eb54b6bd8 ccbc4b9034
commit 6e8e022d0d
1 changed files with 1 additions and 1 deletions
--- 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
@@ -306,6 +305,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();