diff options
| author | George Mount <mount@google.com> | 2014-10-16 14:21:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-10-16 14:21:43 +0000 |
| commit | ea6f0ae86d62cff88d63b926578c588a956d0512 (patch) | |
| tree | 9141ca0a342b197ba93b6e48ff614d3f0f443a16 | |
| parent | 7ef4ba61c83871ea02df760729524bfc7c27b8a9 (diff) | |
| parent | 7c479f5a013fb5544be45cd3a952190fc3a923fc (diff) | |
| download | frameworks_base-ea6f0ae86d62cff88d63b926578c588a956d0512.zip frameworks_base-ea6f0ae86d62cff88d63b926578c588a956d0512.tar.gz frameworks_base-ea6f0ae86d62cff88d63b926578c588a956d0512.tar.bz2 | |
Merge "Use empty snapshots list when there are no shared elements." into lmp-mr1-dev
| -rw-r--r-- | core/java/android/app/ActivityTransitionCoordinator.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/app/ActivityTransitionCoordinator.java b/core/java/android/app/ActivityTransitionCoordinator.java index 5455a0f..d611058 100644 --- a/core/java/android/app/ActivityTransitionCoordinator.java +++ b/core/java/android/app/ActivityTransitionCoordinator.java @@ -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(); |