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

am b71580c3: Merge "Fix NPE when rejected snapshots are null." into lmp-mr1-dev

Browse Source 
* commit 'b71580c34efcc12bf7221c57eccaf80f36cb23bc':
  Fix NPE when rejected snapshots are null.
This commit is contained in:
George Mount
2014-10-24 23:03:42 +00:00
committed by Android Git Automerger
parent 56f77a6f53 b71580c34e
commit 511452cf4d
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) { if (mListener != null) {
mListener.onRejectSharedElements(rejectedSnapshots); mListener.onRejectSharedElements(rejectedSnapshots);
} }
removeNullViews(rejectedSnapshots);
startRejectedAnimations(rejectedSnapshots); startRejectedAnimations(rejectedSnapshots);
// Now start shared element transition // 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() { private void onTakeSharedElements() {
if (!mIsReadyForTransition || mSharedElementsBundle == null) { if (!mIsReadyForTransition || mSharedElementsBundle == null) {
return; return;