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

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

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

* commit 'ea6f0ae8':
  Use empty snapshots list when there are no shared elements.
parents e58249f8 ea6f0ae8
Loading
Loading
Loading
Loading
+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();