blob: ab6d087d407aa7b38a30c9027dd96785d21c0549 [file] [log] [blame]
Jackeagled3ba2282018-11-17 20:49:22 -07001From a9b12570584788b9e4b1ee8a41cdc79f2cbf51e3 Mon Sep 17 00:00:00 2001
Jon West013ef582018-08-21 20:45:26 -04002From: Pierre-Hugues Husson <phh@phh.me>
3Date: Tue, 28 Nov 2017 18:28:04 +0100
Jackeagle0cc335a2018-10-19 00:06:49 -04004Subject: [PATCH 04/26] Relax requirement for visible flag to sdcards
Jon West013ef582018-08-21 20:45:26 -04005
6The vast majority of sdcard readers are stable enough to be declared by
7the API. (I see no counter-example)
8FBE broke adoptable storage with SDCard, hence this need.
9
10Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a
11---
Jackeagled3ba2282018-11-17 20:49:22 -070012 .../core/java/com/android/server/StorageManagerService.java | 3 ++-
Jon West013ef582018-08-21 20:45:26 -040013 1 file changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java
Jackeagled3ba2282018-11-17 20:49:22 -070016index a35357f2864..14ca559c306 100644
Jon West013ef582018-08-21 20:45:26 -040017--- a/services/core/java/com/android/server/StorageManagerService.java
18+++ b/services/core/java/com/android/server/StorageManagerService.java
19@@ -1178,7 +1178,8 @@ class StorageManagerService extends IStorageManager.Stub
20
21 // Adoptable public disks are visible to apps, since they meet
22 // public API requirement of being in a stable location.
23- if (vol.disk.isAdoptable()) {
24+ // Assume all SDs match this as well
25+ if (vol.disk.isAdoptable() || vol.disk.isSd()) {
26 vol.mountFlags |= VolumeInfo.MOUNT_FLAG_VISIBLE;
27 }
28
29--
Jackeagled3ba2282018-11-17 20:49:22 -0700302.17.1
Jon West013ef582018-08-21 20:45:26 -040031