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

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

Merge "Protect use of onFindViewById for Fragment Transitions."

parents fcca000d 498348d3

core/java/android/app/FragmentTransition.java

+8 −2
Original line number Diff line number Diff line
@@ -188,7 +188,10 @@ class FragmentTransition { 
    private static void configureTransitionsOptimized(FragmentManagerImpl fragmentManager,

            int containerId, FragmentContainerTransition fragments,

            View nonExistentView, ArrayMap<String, String> nameOverrides) {

        ViewGroup sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);

        ViewGroup sceneRoot = null;

        if (fragmentManager.mContainer.onHasView()) {

            sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);

        }

        if (sceneRoot == null) {

            return;

        }
@@ -257,7 +260,10 @@ class FragmentTransition { 
    private static void configureTransitionsUnoptimized(FragmentManagerImpl fragmentManager,

            int containerId, FragmentContainerTransition fragments,

            View nonExistentView, ArrayMap<String, String> nameOverrides) {

        ViewGroup sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);

        ViewGroup sceneRoot = null;

        if (fragmentManager.mContainer.onHasView()) {

            sceneRoot = (ViewGroup) fragmentManager.mContainer.onFindViewById(containerId);

        }

        if (sceneRoot == null) {

            return;

        }