Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NPE when shared elements are empty.

Browse Source 
Bug 15608384

Change-Id: Id7ae383873d8d09b51d9c680942076a3a8ffea5b
This commit is contained in:
George Mount
2014-06-13 08:20:32 -07:00
parent d4c3c91dd0
commit 4d994261e9
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/app/ExitTransitionCoordinator.java
View File

@@ -133,8 +133,10 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
public void onTransitionEnd(Transition transition) {
setViewVisibility(mSharedElements, View.INVISIBLE);
ViewGroupOverlay overlay = getDecor().getOverlay();
for (int i = 0; i < mSharedElementSnapshots.size(); i++) {
overlay.add(mSharedElementSnapshots.get(i));
if (mSharedElementSnapshots != null) {
for (int i = 0; i < mSharedElementSnapshots.size(); i++) {
overlay.add(mSharedElementSnapshots.get(i));
}
}
}
});