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

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

Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev

parents 4982e7b4 e9fd6d29

core/java/android/view/ViewGroup.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -793,7 +793,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager 
    @Override

    @Override

    public ActionMode startActionModeForChild(

    public ActionMode startActionModeForChild(

            View originalView, ActionMode.Callback callback, int type) {

            View originalView, ActionMode.Callback callback, int type) {

        if ((mGroupFlags & FLAG_START_ACTION_MODE_FOR_CHILD_IS_NOT_TYPED) == 0) {

        if ((mGroupFlags & FLAG_START_ACTION_MODE_FOR_CHILD_IS_NOT_TYPED) == 0

                && type == ActionMode.TYPE_PRIMARY) {

            ActionMode mode;

            ActionMode mode;

            try {

            try {

                mGroupFlags |= FLAG_START_ACTION_MODE_FOR_CHILD_IS_TYPED;

                mGroupFlags |= FLAG_START_ACTION_MODE_FOR_CHILD_IS_TYPED;