summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@android.com> 2018-12-05 08:30:33 -0800
committer android-build-merger <android-build-merger@google.com> 2018-12-05 08:30:33 -0800
commit0fe81d73202d4978f4789079fd3d6671e987d99a (patch)
tree70eb9e53a1a84dcccead08a786a743ab5e82c5b9
parente27e96e0d5a46f68da540ec55e0159d3dc29ab60 (diff)
parent7f656092df45860bf90d16e758a8bac47bbe4431 (diff)
Merge "Hide eject icon of removable media when it's emulated volume"
am: 7f656092df Change-Id: Icf28f47946aeb9f808041b90893c3543f270f692
-rw-r--r--packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 4a9c35615131..8a5d1119696f 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -222,7 +222,7 @@ public class ExternalStorageProvider extends FileSystemProvider {
root.flags |= Root.FLAG_REMOVABLE_USB;
}
- if (!VolumeInfo.ID_EMULATED_INTERNAL.equals(volume.getId())) {
+ if (volume.getType() != VolumeInfo.TYPE_EMULATED) {
root.flags |= Root.FLAG_SUPPORTS_EJECT;
}