summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorYoukichi Hosoi <youkichihosoi@google.com>2020-07-08 03:27:01 +0900
committerRisan <risan@google.com>2021-01-18 12:09:52 +0000
commitd2905dd0868983ec293c50506a3af64f3ad91c99 (patch)
tree79b02f0d7cfcc326dc199084750abe362f304bb7 /core/java/android
parent3c3711dffd8f4b5a6eeac8aac7fafadb194bf1f6 (diff)
Add MOUNT_FLAG_VISIBLE to visible stub volumes
The visibility setting of a removable device shared with Chrome OS is passed via Disk flags. When a device (stub volume) is marked as visible, we should set the MOUNT_FLAG_VISIBLE flag to it. Bug: 123377807 Bug: 142684891 Bug: 132796154 Test: Toggle the visibility setting of a removable device in the Chrome Test: OS Settings app > Confirm that the device is visible to Android Test: apps only when it is marked as visible. Test: Tested in R Change-Id: I19289596345690b1802738122fe274eeb41f9361
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/os/storage/DiskInfo.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/os/storage/DiskInfo.java b/core/java/android/os/storage/DiskInfo.java
index df3c4d55d979..51856d8bb723 100644
--- a/core/java/android/os/storage/DiskInfo.java
+++ b/core/java/android/os/storage/DiskInfo.java
@@ -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();