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

Commit c49d44c3 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Build browse intents based on target user." into pi-dev

parents fe1b1f19 b4ee5d7b

core/java/android/os/storage/VolumeInfo.java

+5 −1
Original line number Diff line number Diff line
@@ -407,8 +407,12 @@ public class VolumeInfo implements Parcelable { 
     * {@link #TYPE_EMULATED} or {@link #TYPE_PUBLIC}.

     */

    public @Nullable Intent buildBrowseIntent() {

        return buildBrowseIntentForUser(UserHandle.myUserId());

    }



    public @Nullable Intent buildBrowseIntentForUser(int userId) {

        final Uri uri;

        if (type == VolumeInfo.TYPE_PUBLIC && mountUserId == UserHandle.myUserId()) {

        if (type == VolumeInfo.TYPE_PUBLIC && mountUserId == userId) {

            uri = DocumentsContract.buildRootUri(DOCUMENT_AUTHORITY, fsUuid);

        } else if (type == VolumeInfo.TYPE_EMULATED && isPrimary()) {

            uri = DocumentsContract.buildRootUri(DOCUMENT_AUTHORITY,

packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ public class StorageNotification extends SystemUI { 
    }



    private PendingIntent buildBrowsePendingIntent(VolumeInfo vol) {

        final Intent intent = vol.buildBrowseIntent();

        final Intent intent = vol.buildBrowseIntentForUser(vol.getMountUserId());



        final int requestKey = vol.getId().hashCode();

        return PendingIntent.getActivityAsUser(mContext, requestKey, intent,