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

Commit e3f84a57 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Make finish() a no-op on a context mode that is not active."

parents 0a9f5164 93b6bc3d

core/java/com/android/internal/app/ActionBarImpl.java

+5 −0
Original line number Diff line number Diff line
@@ -383,6 +383,11 @@ public class ActionBarImpl extends ActionBar { 


        @Override

        public void finish() {

            if (mContextMode != this) {

                // Not the active context mode - no-op

                return;

            }



            mCallback.onDestroyContextualMode(this);

            mAnimatorView.setDisplayedChild(NORMAL_VIEW);