summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tony Huang <tonyychuang@google.com> 2019-12-18 06:01:46 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-12-18 06:01:46 +0000
commitfa2d40ae9dcee339a460cceb85aa8e56b74eb40b (patch)
tree6f86e2fc379478004acc56b524d0309df37ec02a
parentc4b8d34e73f7940d58ed8b4d15dc82288babf6d8 (diff)
parent0bd88fb2d38105967ef94f99292441f9e97a93f4 (diff)
Merge "Fix crash when stack push"
-rw-r--r--src/com/android/documentsui/AbstractActionHandler.java5
-rw-r--r--tests/unit/com/android/documentsui/picker/ActionHandlerTest.java8
2 files changed, 13 insertions, 0 deletions
diff --git a/src/com/android/documentsui/AbstractActionHandler.java b/src/com/android/documentsui/AbstractActionHandler.java
index a20e3e7e4..fa2c60fa4 100644
--- a/src/com/android/documentsui/AbstractActionHandler.java
+++ b/src/com/android/documentsui/AbstractActionHandler.java
@@ -412,6 +412,11 @@ public abstract class AbstractActionHandler<T extends FragmentActivity & CommonA
}
assert(currentDoc != null);
+ if (currentDoc.equals(mState.stack.peek())) {
+ Log.w(TAG, "This DocumentInfo is already in current DocumentsStack");
+ return;
+ }
+
mActivity.notifyDirectoryNavigated(currentDoc.derivedUri);
mState.stack.push(currentDoc);
diff --git a/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java b/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java
index 819b34918..647ce719e 100644
--- a/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java
+++ b/tests/unit/com/android/documentsui/picker/ActionHandlerTest.java
@@ -256,6 +256,14 @@ public class ActionHandlerTest {
}
@Test
+ public void testOpenContainerDocument_sameDocumentInfo() {
+ mHandler.openContainerDocument(TestEnv.FOLDER_0);
+ mHandler.openContainerDocument(TestEnv.FOLDER_0);
+
+ assertEquals(1, mEnv.state.stack.size());
+ }
+
+ @Test
public void testIncreasePickCountRecordCalled() throws Exception {
mEnv.state.action = State.ACTION_GET_CONTENT;
mEnv.state.stack.changeRoot(TestProvidersAccess.HOME);