commit 29ce4d5fda253338860f441397c6034277bf7383
author Jeff Sharkey <jsharkey@android.com> Wed Dec 05 08:38:43 2018 -0800
committer android-build-merger <android-build-merger@google.com> Wed Dec 05 08:38:43 2018 -0800
tree d7f735d71572a137bf6b22919ecde5853d596603
parent 460feac16d555a3c11a74029ec192e7dae67f57c
parent 0fe81d73202d4978f4789079fd3d6671e987d99a

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

Change-Id: Ia2b865c56a92265151444b4b7310b61c51a9a952

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 4a9c356..8a5d111 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -222,7 +222,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;
             }