From da19ee00a30f04fb54f281df6c7df86ececeeab7 Mon Sep 17 00:00:00 2001
From: Daichi Hirono <hirono@google.com>
Date: Wed, 13 Jan 2016 13:19:02 +0900
Subject: Stop listening root change events when the activity is destroyed.

BUG=26454244

Change-Id: I4be98f21843d6d501dd9c6fc343e905e107fc1c1
---
 .../DocumentsUI/src/com/android/documentsui/BaseActivity.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index 180a48eaca99..dfeef5022bc0 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -176,6 +176,12 @@ public abstract class BaseActivity extends Activity {
         return true;
     }
 
+    @Override
+    protected void onDestroy() {
+        mRoots.setOnCacheUpdateListener(null);
+        super.onDestroy();
+    }
+
     State buildDefaultState() {
         State state = new State();
 
@@ -518,7 +524,7 @@ public abstract class BaseActivity extends Activity {
 
         @Override
         protected void onPostExecute(DocumentInfo result) {
-            if (result != null) {
+            if (result != null && !isDestroyed()) {
                 openContainerDocument(result);
             }
         }
-- 
cgit v1.2.3-59-g8ed1b