Merge "Add MOUNT_FLAG_VISIBLE to visible stub volumes" (d8e3e072) · Commits · e / os / android_frameworks_base

core/java/android/os/storage/DiskInfo.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -50,6 +50,8 @@ public class DiskInfo implements Parcelable {
		public static final int FLAG_DEFAULT_PRIMARY = 1 << 1;
		public static final int FLAG_SD = 1 << 2;
		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;
		@UnsupportedAppUsage
		@@ -152,6 +154,10 @@ public class DiskInfo implements Parcelable {
		return (flags & FLAG_USB) != 0;
		}

		public boolean isStubVisible() {
		return (flags & FLAG_STUB_VISIBLE) != 0;
		}

		@Override
		public String toString() {
		final CharArrayWriter writer = new CharArrayWriter();

+3 −0

Original line number	Diff line number	Diff line
		@@ -1537,6 +1537,9 @@ class StorageManagerService extends IStorageManager.Stub
		mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();

		} else if (vol.type == VolumeInfo.TYPE_STUB) {
		if (vol.disk.isStubVisible()) {
		vol.mountFlags \|= VolumeInfo.MOUNT_FLAG_VISIBLE;
		}
		vol.mountUserId = mCurrentUserId;
		mHandler.obtainMessage(H_VOLUME_MOUNT, vol).sendToTarget();
		} else {