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

Commit 7c482463 authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev

parents 20df6234 13d7032d

core/java/android/app/BackStackRecord.java

+8 −4
Original line number Original line Diff line number Diff line
@@ -1094,8 +1094,10 @@ final class BackStackRecord extends FragmentTransaction implements 
                        container.getViewTreeObserver().removeOnPreDrawListener(this);

                        container.getViewTreeObserver().removeOnPreDrawListener(this);





                        // Don't include any newly-hidden fragments in the transition.

                        // Don't include any newly-hidden fragments in the transition.

                        if (inFragment != null) {

                            excludeHiddenFragments(hiddenFragmentViews, inFragment.mContainerId,

                            excludeHiddenFragments(hiddenFragmentViews, inFragment.mContainerId,

                                    overallTransition);

                                    overallTransition);

                        }





                        ArrayMap<String, View> namedViews = null;

                        ArrayMap<String, View> namedViews = null;

                        if (sharedElementTransition != null) {

                        if (sharedElementTransition != null) {
@@ -1692,7 +1694,7 @@ final class BackStackRecord extends FragmentTransaction implements 




    private static void setNameOverrides(TransitionState state, ArrayList<String> sourceNames,

    private static void setNameOverrides(TransitionState state, ArrayList<String> sourceNames,

            ArrayList<String> targetNames) {

            ArrayList<String> targetNames) {

        if (sourceNames != null) {

        if (sourceNames != null && targetNames != null) {

            for (int i = 0; i < sourceNames.size(); i++) {

            for (int i = 0; i < sourceNames.size(); i++) {

                String source = sourceNames.get(i);

                String source = sourceNames.get(i);

                String target = targetNames.get(i);

                String target = targetNames.get(i);
@@ -1703,7 +1705,9 @@ final class BackStackRecord extends FragmentTransaction implements 




    private void setBackNameOverrides(TransitionState state, ArrayMap<String, View> namedViews,

    private void setBackNameOverrides(TransitionState state, ArrayMap<String, View> namedViews,

            boolean isEnd) {

            boolean isEnd) {

        int count = mSharedElementTargetNames == null ? 0 : mSharedElementTargetNames.size();

        int targetCount = mSharedElementTargetNames == null ? 0 : mSharedElementTargetNames.size();

        int sourceCount = mSharedElementSourceNames == null ? 0 : mSharedElementSourceNames.size();

        final int count = Math.min(targetCount, sourceCount);

        for (int i = 0; i < count; i++) {

        for (int i = 0; i < count; i++) {

            String source = mSharedElementSourceNames.get(i);

            String source = mSharedElementSourceNames.get(i);

            String originalTarget = mSharedElementTargetNames.get(i);

            String originalTarget = mSharedElementTargetNames.get(i);