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

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

am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no... 

am 27a08f2a: am ea6f0ae8: Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev

* commit '27a08f2a':
  Use empty snapshots list when there are no shared elements.
parents 06965cfd 27a08f2a

core/java/android/app/ActivityTransitionCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -543,10 +543,10 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 


    protected ArrayList<View> createSnapshots(Bundle state, Collection<String> names) {

        int numSharedElements = names.size();

        ArrayList<View> snapshots = new ArrayList<View>(numSharedElements);

        if (numSharedElements == 0) {

            return null;

            return snapshots;

        }

        ArrayList<View> snapshots = new ArrayList<View>(numSharedElements);

        Context context = getWindow().getContext();

        int[] decorLoc = new int[2];

        ViewGroup decorView = getDecor();