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

Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev

Browse Source
This commit is contained in:
George Mount
2015-07-21 22:51:27 +00:00
committed by Android (Google) Code Review
parent 20df623459 13d7032d59
commit 7c482463cb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/BackStackRecord.java
View File

@@ -1094,8 +1094,10 @@ final class BackStackRecord extends FragmentTransaction implements
container.getViewTreeObserver().removeOnPreDrawListener(this); container.getViewTreeObserver().removeOnPreDrawListener(this);
// Don't include any newly-hidden fragments in the transition. // Don't include any newly-hidden fragments in the transition.
if (inFragment != null) {
excludeHiddenFragments(hiddenFragmentViews, inFragment.mContainerId, excludeHiddenFragments(hiddenFragmentViews, inFragment.mContainerId,
overallTransition); overallTransition);
}
ArrayMap<String, View> namedViews = null; ArrayMap<String, View> namedViews = null;
if (sharedElementTransition != null) { if (sharedElementTransition != null) {
@@ -1692,7 +1694,7 @@ final class BackStackRecord extends FragmentTransaction implements
private static void setNameOverrides(TransitionState state, ArrayList<String> sourceNames, private static void setNameOverrides(TransitionState state, ArrayList<String> sourceNames,
ArrayList<String> targetNames) { ArrayList<String> targetNames) {
if (sourceNames != null) { if (sourceNames != null && targetNames != null) {
for (int i = 0; i < sourceNames.size(); i++) { for (int i = 0; i < sourceNames.size(); i++) {
String source = sourceNames.get(i); String source = sourceNames.get(i);
String target = targetNames.get(i); String target = targetNames.get(i);
@@ -1703,7 +1705,9 @@ final class BackStackRecord extends FragmentTransaction implements
private void setBackNameOverrides(TransitionState state, ArrayMap<String, View> namedViews, private void setBackNameOverrides(TransitionState state, ArrayMap<String, View> namedViews,
boolean isEnd) { boolean isEnd) {
int count = mSharedElementTargetNames == null ? 0 : mSharedElementTargetNames.size(); int targetCount = mSharedElementTargetNames == null ? 0 : mSharedElementTargetNames.size();
int sourceCount = mSharedElementSourceNames == null ? 0 : mSharedElementSourceNames.size();
final int count = Math.min(targetCount, sourceCount);
for (int i = 0; i < count; i++) { for (int i = 0; i < count; i++) {
String source = mSharedElementSourceNames.get(i); String source = mSharedElementSourceNames.get(i);
String originalTarget = mSharedElementTargetNames.get(i); String originalTarget = mSharedElementTargetNames.get(i);