Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 1 | From a9b12570584788b9e4b1ee8a41cdc79f2cbf51e3 Mon Sep 17 00:00:00 2001 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 2 | From: Pierre-Hugues Husson <phh@phh.me> |
| 3 | Date: Tue, 28 Nov 2017 18:28:04 +0100 |
Jackeagle | 0cc335a | 2018-10-19 00:06:49 -0400 | [diff] [blame] | 4 | Subject: [PATCH 04/26] Relax requirement for visible flag to sdcards |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 5 | |
| 6 | The vast majority of sdcard readers are stable enough to be declared by |
| 7 | the API. (I see no counter-example) |
| 8 | FBE broke adoptable storage with SDCard, hence this need. |
| 9 | |
| 10 | Change-Id: Ia616671c03562d1eadaff5531a5c708a62d7ad3a |
| 11 | --- |
Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 12 | .../core/java/com/android/server/StorageManagerService.java | 3 ++- |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 13 | 1 file changed, 2 insertions(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java |
Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 16 | index a35357f2864..14ca559c306 100644 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 17 | --- 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 | -- |
Jackeagle | d3ba228 | 2018-11-17 20:49:22 -0700 | [diff] [blame] | 30 | 2.17.1 |
Jon West | 013ef58 | 2018-08-21 20:45:26 -0400 | [diff] [blame] | 31 | |