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

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

Browse Source 
am: c49d44c3ef

Change-Id: I3e7bd4bc41115c42687be3be7c5a03e0919dfaf1
This commit is contained in:
Jeff Sharkey
2018-05-22 13:57:30 -07:00
committed by android-build-merger
parent 8fa6942fb1 c49d44c3ef
commit fab272e037
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/os/storage/VolumeInfo.java
View File

@@ -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,

2
packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
View File

@@ -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,