commit aa315dbb361e447b6442efc562b41d9b6fedf4e4
author George Mount <mount@google.com> Tue Jun 30 14:33:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 30 14:33:02 2015 +0000
tree 3c266535915070428b70904695da3de24ca31d60
parent 5be01687c3ddf164920987bec878ad78d8cf085b
parent 0303d9ce70db4cbb4b9052fcd567b04e69405318

am 0303d9ce: Merge "Fix FragmentTransaction replace() behavior" into mnc-dev

* commit '0303d9ce70db4cbb4b9052fcd567b04e69405318':
  Fix FragmentTransaction replace() behavior

core/java/android/app/BackStackRecord.java

diff --git a/core/java/android/app/BackStackRecord.java b/core/java/android/app/BackStackRecord.java
index 903411e..13030ca 100644
--- a/core/java/android/app/BackStackRecord.java
+++ b/core/java/android/app/BackStackRecord.java
@@ -717,6 +717,7 @@
                 break;
                 case OP_REPLACE: {
                     Fragment f = op.fragment;
+                    int containerId = f.mContainerId;
                     if (mManager.mAdded != null) {
                         for (int i = 0; i < mManager.mAdded.size(); i++) {
                             Fragment old = mManager.mAdded.get(i);
@@ -724,7 +725,7 @@
                                 Log.v(TAG,
                                         "OP_REPLACE: adding=" + f + " old=" + old);
                             }
-                            if (f == null || old.mContainerId == f.mContainerId) {
+                            if (old.mContainerId == containerId) {
                                 if (old == f) {
                                     op.fragment = f = null;
                                 } else {