From 851179dbec700e36f627bb5482be2e7089bdab38 Mon Sep 17 00:00:00 2001
From: George Mount <mount@google.com>
Date: Thu, 27 Oct 2016 14:22:27 -0700
Subject: [PATCH] Perform onDestroy when FragmentController is torn down.

Bug 32457575

Test: I9e33801c34bcb31e3d6ca0df3962cfe1a3203044
Change-Id: Id220dbfb3e42d2c91b99926c1e9b0c556c9b453a
---
 core/java/android/app/FragmentManager.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/java/android/app/FragmentManager.java b/core/java/android/app/FragmentManager.java
index 233fee73f6012..ce32d810fa8a3 100644
--- a/core/java/android/app/FragmentManager.java
+++ b/core/java/android/app/FragmentManager.java
@@ -1233,9 +1233,9 @@ final class FragmentManagerImpl extends FragmentManager implements LayoutInflate
         int nextState = mCurState;
         if (f.mRemoving) {
             if (f.isInBackStack()) {
-                nextState = Fragment.CREATED;
+                nextState = Math.min(nextState, Fragment.CREATED);
             } else {
-                nextState = Fragment.INITIALIZING;
+                nextState = Math.min(nextState, Fragment.INITIALIZING);
             }
         }