From a79674619895b3c646fa0b94f8592f25b0fe98f1 Mon Sep 17 00:00:00 2001 From: Daichi Hirono Date: Thu, 14 Jan 2016 12:45:49 +0900 Subject: [PATCH] Check isDestroyed after finishing async HandleRootsChangedTask. HandleRootsChangedTask will be finished after the Activity is destroyed, though we no longer to be able to change the directory at that time. BUG=26454277 Change-Id: Ia414134c80d900ef2e6c382fdd9209a154d940af --- .../DocumentsUI/src/com/android/documentsui/BaseActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index 180a48eaca991..2e2dccda42209 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -630,7 +630,7 @@ public abstract class BaseActivity extends Activity { @Override protected void onPostExecute(RootInfo homeRoot) { - if (homeRoot != null && mHome != null) { + if (homeRoot != null && mHome != null && !isDestroyed()) { // Clear entire backstack and start in new root mState.onRootChanged(homeRoot); mSearchManager.update(homeRoot);