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

Merge "Add MOUNT_FLAG_VISIBLE to visible stub volumes" am: d8e3e07264 am: eba787f7a5

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1536320

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21d5560f0d061cae9c8959cb658a75fd14e7ed76
This commit is contained in:
Treehugger Robot
2021-01-18 16:25:48 +00:00
committed by Automerger Merge Worker
parent bc481755f4 eba787f7a5
commit 8187197857
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,8 @@ public class DiskInfo implements Parcelable {
public static final int FLAG_DEFAULT_PRIMARY = 1 << 1; public static final int FLAG_DEFAULT_PRIMARY = 1 << 1;
public static final int FLAG_SD = 1 << 2; public static final int FLAG_SD = 1 << 2;
public static final int FLAG_USB = 1 << 3; public static final int FLAG_USB = 1 << 3;
/** The FLAG_STUB_VISIBLE is set from vold, which gets the flag from outside (e.g., ChromeOS) */
public static final int FLAG_STUB_VISIBLE = 1 << 6;
public final String id; public final String id;
@UnsupportedAppUsage @UnsupportedAppUsage
@@ -152,6 +154,10 @@ public class DiskInfo implements Parcelable {
return (flags & FLAG_USB) != 0; return (flags & FLAG_USB) != 0;
} }
public boolean isStubVisible() {
return (flags & FLAG_STUB_VISIBLE) != 0;
}
@Override @Override
public String toString() { public String toString() {
final CharArrayWriter writer = new CharArrayWriter(); final CharArrayWriter writer = new CharArrayWriter();

3
services/core/java/com/android/server/StorageManagerService.java
View File

@@ -1537,6 +1537,9 @@ class StorageManagerService extends IStorageManager.Stub
mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget(); mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
} else if (vol.type == VolumeInfo.TYPE_STUB) { } else if (vol.type == VolumeInfo.TYPE_STUB) {
if (vol.disk.isStubVisible()) {
vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
}
vol.mountUserId = mCurrentUserId; vol.mountUserId = mCurrentUserId;
mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget(); mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
} else { } else {