Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e8e022d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 2eb54b6b ccbc4b90

packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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();