diff options
author | Jeff Sharkey <jsharkey@android.com> | 2015-06-17 04:08:17 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-17 04:08:17 +0000 |
commit | d3e5453f2e5e7a58ada5b8524413d88b3f23d04d (patch) | |
tree | ac4942975b7856ccd9d2ad0098c762566fd5460c /packages/DocumentsUI | |
parent | cfcd232e453cbb9a0ce2ac1f61250680afdb1b52 (diff) | |
parent | 3d00f7a1be6ff858a89e2220f33231ecb3570ef3 (diff) | |
download | frameworks_base-d3e5453f2e5e7a58ada5b8524413d88b3f23d04d.zip frameworks_base-d3e5453f2e5e7a58ada5b8524413d88b3f23d04d.tar.gz frameworks_base-d3e5453f2e5e7a58ada5b8524413d88b3f23d04d.tar.bz2 |
am 3d00f7a1: Merge "Finish when browsed root goes away." into mnc-dev
* commit '3d00f7a1be6ff858a89e2220f33231ecb3570ef3':
Finish when browsed root goes away.
Diffstat (limited to 'packages/DocumentsUI')
-rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index bba33be..fc46716 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -25,7 +25,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.HashSet; import java.util.List; import java.util.concurrent.Executor; @@ -97,6 +96,22 @@ abstract class BaseActivity extends Activity { } @Override + public void onResume() { + super.onResume(); + + final State state = getDisplayState(); + final RootInfo root = getCurrentRoot(); + + // If we're browsing a specific root, and that root went away, then we + // have no reason to hang around + if (state.action == State.ACTION_BROWSE && root != null) { + if (mRoots.getRootBlocking(root.authority, root.rootId) == null) { + finish(); + } + } + } + + @Override public boolean onCreateOptionsMenu(Menu menu) { boolean showMenu = super.onCreateOptionsMenu(menu); |