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

Commit f028e103 authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am d5da500e: am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix... 

am d5da500e: am fbb670d9: am 5a988492: am 00877d68: am f187823e: Merge "Fix exception when fragment container has no View." into lmp-dev

* commit 'd5da500e170fe3e2b430f27ac250b5b61dc90bcc':
  Fix exception when fragment container has no View.
parents e06fa379 1a780826

core/java/android/app/Activity.java

+5 −0
Original line number Diff line number Diff line
@@ -745,6 +745,11 @@ public class Activity extends ContextThemeWrapper 
        public View findViewById(int id) {

            return Activity.this.findViewById(id);

        }

        @Override

        public boolean hasView() {

            Window window = Activity.this.getWindow();

            return (window != null && window.peekDecorView() != null);

        }

    };



    // Most recent call to requestVisibleBehind().

core/java/android/app/BackStackRecord.java

+6 −0
Original line number Diff line number Diff line
@@ -868,6 +868,9 @@ final class BackStackRecord extends FragmentTransaction implements 
     */

    private void calculateFragments(SparseArray<Fragment> firstOutFragments,

            SparseArray<Fragment> lastInFragments) {

        if (!mManager.mContainer.hasView()) {

            return; // nothing to see, so no transitions

        }

        Op op = mHead;

        while (op != null) {

            switch (op.cmd) {
@@ -923,6 +926,9 @@ final class BackStackRecord extends FragmentTransaction implements 
     */

    public void calculateBackFragments(SparseArray<Fragment> firstOutFragments,

            SparseArray<Fragment> lastInFragments) {

        if (!mManager.mContainer.hasView()) {

            return; // nothing to see, so no transitions

        }

        Op op = mHead;

        while (op != null) {

            switch (op.cmd) {

core/java/android/app/Fragment.java

+5 −0
Original line number Diff line number Diff line
@@ -2014,6 +2014,11 @@ public class Fragment implements ComponentCallbacks2, OnCreateContextMenuListene 
                }

                return mView.findViewById(id);

            }



            @Override

            public boolean hasView() {

                return (mView != null);

            }

        }, this);

    }

core/java/android/app/FragmentManager.java

+1 −0
Original line number Diff line number Diff line
@@ -395,6 +395,7 @@ final class FragmentManagerState implements Parcelable { 
 */

interface FragmentContainer {

    public View findViewById(int id);

    public boolean hasView();

}



/**