From f5f03fc083abbb7a35edcd8e41766588117bcd39 Mon Sep 17 00:00:00 2001
From: Takamasa Kuramitsu <takamasa.kuramitsu@sony.com>
Date: Thu, 4 Oct 2018 17:56:37 +0900
Subject: [PATCH] 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
---
 .../com/android/externalstorage/ExternalStorageProvider.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 4a9c35615131a..8a5d1119696f4 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;
             }