commit 2a804194094da4fa2013104d947a858b919c6adb
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 17 23:06:13 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 17 23:06:17 2017 +0000
tree 027fd6152e0fe8b09d2d4ca646e452486c9aa5f3
parent dd903d4f0ee4cebcef03e54f5b07f4bcc14c5dbc
parent 521862de53d2b31c1e1b25c424e0c53579f59433

Merge "Catch reentrancy while executing postponed transactions."

core/java/android/app/FragmentManager.java

diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index d32cf3c..739015f 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1911,7 +1911,12 @@
             mTmpRecords = new ArrayList<>();
             mTmpIsPop = new ArrayList<>();
         }
-        executePostponedTransaction(null, null);
+        mExecutingActions = true;
+        try {
+            executePostponedTransaction(null, null);
+        } finally {
+            mExecutingActions = false;
+        }
     }
 
     public void execSingleAction(OpGenerator action, boolean allowStateLoss) {