Merge "Stop listening root change events when the activity is destroyed."

2016-01-13 18:21:08 +00:00
parent ab064b3b36 da19ee00a3
commit f3b34603de
1 changed files with 7 additions and 1 deletions
--- 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);
            }
        }