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

Merge "Fix NPE when combining pop with add transaction."

Browse Source
This commit is contained in:
George Mount
2017-03-02 15:12:26 +00:00
committed by Android (Google) Code Review
parent 00a5f2a658 f05db56f24
commit 0882330c39
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/app/FragmentTransition.java
View File

@@ -780,8 +780,10 @@ class FragmentTransition {
names = inTransaction.mSharedElementTargetNames;
}
inSharedElements.retainAll(names);
if (sharedElementCallback != null) {
if (names != null) {
inSharedElements.retainAll(names);
}
if (names != null && sharedElementCallback != null) {
sharedElementCallback.onMapSharedElements(names, inSharedElements);
for (int i = names.size() - 1; i >= 0; i--) {
String name = names.get(i);
@@ -830,8 +832,9 @@ class FragmentTransition {
FragmentContainerTransition fragments,
Transition enterTransition, boolean inIsPop) {
BackStackRecord inTransaction = fragments.lastInTransaction;
if (enterTransition != null && inTransaction.mSharedElementSourceNames != null &&
!inTransaction.mSharedElementSourceNames.isEmpty()) {
if (enterTransition != null && inSharedElements != null
&& inTransaction.mSharedElementSourceNames != null
&& !inTransaction.mSharedElementSourceNames.isEmpty()) {
final String targetName = inIsPop
? inTransaction.mSharedElementSourceNames.get(0)
: inTransaction.mSharedElementTargetNames.get(0);
@@ -1096,7 +1099,9 @@ class FragmentTransition {
if (transition != null) {
viewList = new ArrayList<>();
View root = fragment.getView();
root.captureTransitioningViews(viewList);
if (root != null) {
root.captureTransitioningViews(viewList);
}
if (sharedElements != null) {
viewList.removeAll(sharedElements);
}