Merge "Hide eject icon of removable media when it's emulated volume" am: 7f656092df am: 0fe81d7320

am: 29ce4d5fda

Change-Id: I815654df758200596b949943738608cd42ecdc40

packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java

@@ -224,7 +224,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;
             }