Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't assert on uris with stack." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-31 22:03:27 +00:00
committed by Android (Google) Code Review
parent 1755dd08cb 3c6d499858
commit 760b557158
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java
View File

@@ -86,17 +86,26 @@ public class FilesActivity extends BaseActivity {
if (mState.restored) { if (mState.restored) {
if (DEBUG) Log.d(TAG, "Stack already resolved for uri: " + intent.getData()); if (DEBUG) Log.d(TAG, "Stack already resolved for uri: " + intent.getData());
} else if (!mState.stack.isEmpty()) { } else if (!mState.stack.isEmpty()) {
// If a non-empty stack is present in our state it was read (presumably) // If a non-empty stack is present in our state, it was read (presumably)
// from EXTRA_STACK intent extra. In this case, we'll skip other means of // from EXTRA_STACK intent extra. In this case, we'll skip other means of
// loading or restoring the stack. // loading or restoring the stack (like URI).
// //
// When restoring from a stack, if a URI is present, it should only ever // When restoring from a stack, if a URI is present, it should only ever be:
// be a launch URI, or a fake Uri from notifications. // -- a launch URI: Launch URIs support sensible activity management,
// Launch URIs support sensible activity management, but don't specify a real // but don't specify a real content target)
// content target. // -- a fake Uri from notifications. These URIs have no authority (TODO: details).
//
// Any other URI is *sorta* unexpected...except when browsing an archive
// in downloads.
if(uri != null
&& uri.getAuthority() != null
&& !uri.equals(mState.stack.peek())
&& !LauncherActivity.isLaunchUri(uri)) {
if (DEBUG) Log.w(TAG,
"Launching with non-empty stack. Ignoring unexpected uri: " + uri);
} else {
if (DEBUG) Log.d(TAG, "Launching with non-empty stack."); if (DEBUG) Log.d(TAG, "Launching with non-empty stack.");
assert(uri == null || uri.getAuthority() == null || }
LauncherActivity.isLaunchUri(uri));
refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE); refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);
} else if (Intent.ACTION_VIEW.equals(intent.getAction())) { } else if (Intent.ACTION_VIEW.equals(intent.getAction())) {
assert(uri != null); assert(uri != null);