summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-01-21 07:11:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-21 07:11:59 +0000
commitaed1ec2ab890a75741a48e466f587f9f0e9254f9 (patch)
treed26b6f4fa5ad01fed5be15bb52a0c2dd7e6de1c8
parentf6ed082d5a22512e5d92c438990e7fb973eb6c31 (diff)
parent2ab139414aceb8a6d5fd7073a9b1b88210ad043d (diff)
Merge "Disable eject button for StubVolumes" am: fef33579a6 am: e817b6d6e7 am: 2ab139414a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914530 Change-Id: I0e2aee7f15f844c39ea336be8e5dd8720ab480e4
-rw-r--r--packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java3
1 files changed, 2 insertions, 1 deletions
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;
}