summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-01-21 07:12:37 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-01-21 07:12:37 +0000
commitc586fcb99454b4d0460c601dec2d68bbb9510efd (patch)
tree4a57244bd6c50bd5dcd863e1a0bba1c08e3876b2
parent57b945cd2323d7fe84d8459b20a96e4a42cd1716 (diff)
parentaed1ec2ab890a75741a48e466f587f9f0e9254f9 (diff)
Merge "Disable eject button for StubVolumes" am: fef33579a6 am: e817b6d6e7 am: 2ab139414a am: aed1ec2ab8
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1914530 Change-Id: I9c24e936fbeed05c15c65ff3b5ca671431eab9f5
-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;
}