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

Fix NPE when rejected snapshots are null.

Browse Source 
Bug 18055705

Change-Id: Id0b98e7da5510af438c5d66c0ddb00489d581864
This commit is contained in:
George Mount
2014-10-23 11:11:17 -07:00
parent 104d2484ec
commit 83c692efd3
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/app/EnterTransitionCoordinator.java
View File

@@ -322,6 +322,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
if (mListener != null) {
mListener.onRejectSharedElements(rejectedSnapshots);
}
removeNullViews(rejectedSnapshots);
startRejectedAnimations(rejectedSnapshots);
// Now start shared element transition
@@ -370,6 +371,16 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator {
}
}
private static void removeNullViews(ArrayList<View> views) {
if (views != null) {
for (int i = views.size() - 1; i >= 0; i--) {
if (views.get(i) == null) {
views.remove(i);
}
}
}
}
private void onTakeSharedElements() {
if (!mIsReadyForTransition || mSharedElementsBundle == null) {
return;