Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebc6d42d authored by Steve McKay's avatar Steve McKay Committed by android-build-merger
Browse files

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

am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: I888984060b578ecff9dfefc70e6adacafe49e14c
parents a91a1dc9 6b3b3ab4

src/com/android/documentsui/FilesActivity.java

+18 −9
Original line number Diff line number Diff line
@@ -86,17 +86,26 @@ public class FilesActivity extends BaseActivity { 
        if (mState.restored) {

            if (DEBUG) Log.d(TAG, "Stack already resolved for uri: " + intent.getData());

        } 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

            // 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

            // be a launch URI, or a fake Uri from notifications.

            // Launch URIs support sensible activity management, but don't specify a real

            // content target.

            // When restoring from a stack, if a URI is present, it should only ever be:

            // -- a launch URI: Launch URIs support sensible activity management,

            //    but don't specify a real 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.");

            assert(uri == null || uri.getAuthority() == null ||

                    LauncherActivity.isLaunchUri(uri));

            }

            refreshCurrentRootAndDirectory(AnimationView.ANIM_NONE);

        } else if (Intent.ACTION_VIEW.equals(intent.getAction())) {

            assert(uri != null);