From d24047fdbc913d2c5c57731d4dd56bcda0bc1eb7 Mon Sep 17 00:00:00 2001 From: Youkichi Hosoi Date: Wed, 8 Dec 2021 17:35:42 +0900 Subject: Disable eject button for StubVolumes StubVolumes are managed from outside Android (e.g. Chrome OS). So, they should not be unmounted via the eject button in DocumentsUI. Bug: 187111763 Test: (Tested in R) Manually check and confirm that the eject button is not shown for mounted StubVolumes. Change-Id: Ie7c6d1ec846b20694d98f4cb34099ad5dfcf6478 --- .../src/com/android/externalstorage/ExternalStorageProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index a3eb0eccad9d..ce58ff6fc59d 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -236,7 +236,8 @@ public class ExternalStorageProvider extends FileSystemProvider { root.flags |= Root.FLAG_REMOVABLE_USB; } - if (volume.getType() != VolumeInfo.TYPE_EMULATED) { + if (volume.getType() != VolumeInfo.TYPE_EMULATED + && volume.getType() != VolumeInfo.TYPE_STUB) { root.flags |= Root.FLAG_SUPPORTS_EJECT; } -- cgit v1.2.3-59-g8ed1b