summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakamasa Kuramitsu <takamasa.kuramitsu@sony.com>2018-10-04 17:56:37 +0900
committerTakamasa Kuramitsu <takamasa.kuramitsu@sony.com>2018-11-29 03:08:07 +0000
commitf5f03fc083abbb7a35edcd8e41766588117bcd39 (patch)
treea6ec33c82d2d86bf1aa6d4c0bdc146484692985d
parent8757179e52e1997876e3af3b574d97df3ea2385a (diff)
Hide eject icon of removable media when it's emulated volume
Hide eject icon of removable media on the root list of Files app when primary shared storage is in adopted media due to the following reasons. - Primary shared storage should not be easily ejected because that causes the situation that there's no primary shared storage - To align with the Storage settings (Settings > Storage), eject icon is disabled in this menu when the removable media is adopted - Eject action from Files app can only unmount primary shared storage Bug: 117252468 Test: manual Change-Id: Idd76229fb10db621a817afd60295787c761345b1
-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;
}