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

Merge "Fix FragmentTransaction replace() behavior" into mnc-dev

Browse Source
This commit is contained in:
George Mount
2015-06-30 14:21:45 +00:00
committed by Android (Google) Code Review
parent 4572cbc917 22369d519d
commit 0303d9ce70
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -717,6 +717,7 @@ final class BackStackRecord extends FragmentTransaction implements
break; break;
case OP_REPLACE: { case OP_REPLACE: {
Fragment f = op.fragment; Fragment f = op.fragment;
int containerId = f.mContainerId;
if (mManager.mAdded != null) { if (mManager.mAdded != null) {
for (int i = 0; i < mManager.mAdded.size(); i++) { for (int i = 0; i < mManager.mAdded.size(); i++) {
Fragment old = mManager.mAdded.get(i); Fragment old = mManager.mAdded.get(i);
@@ -724,7 +725,7 @@ final class BackStackRecord extends FragmentTransaction implements
Log.v(TAG, Log.v(TAG,
"OP_REPLACE: adding=" + f + " old=" + old); "OP_REPLACE: adding=" + f + " old=" + old);
} }
if (f == null || old.mContainerId == f.mContainerId) { if (old.mContainerId == containerId) {
if (old == f) { if (old == f) {
op.fragment = f = null; op.fragment = f = null;
} else { } else {