commit efd355c1c355ba237204c0a8bce10355382a64cd
author Jeff Sharkey <jsharkey@android.com> Wed Dec 05 08:48:12 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 08:48:12 2018 -0800
tree c1be6443dcfbb0d465a71a48e7ea15c69e4670e2
parent 85c34682bb5d07f13db62fbca1baffcd6f3a856f
parent 29ce4d5fda253338860f441397c6034277bf7383

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

diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index c9ee5c8..1eb4b74 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -224,7 +224,7 @@
                 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;
             }