From 7f2433549325c0843d10fb5de34e0159fbb9cbf9 Mon Sep 17 00:00:00 2001 From: Shikha Malhotra Date: Mon, 24 Jan 2022 20:20:39 +0000 Subject: Fix getStorageVolumes to return only storage volumes available to the calling user Before this change, it also returns volumes (SDCards) that are mounted on a different user. Bug: b/196928102 Test: atest StorageManagerTest Test: atest StorageManagerCrossProfileUSBTest Test: atest StorageManagerCrossProfileSDCardTest Change-Id: I2bcece22a67a1b06281ec73608d83a31b315b8c8 --- services/core/java/com/android/server/StorageManagerService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/StorageManagerService.java b/services/core/java/com/android/server/StorageManagerService.java index 8aeae6ae49b9..6b22547ae376 100644 --- a/services/core/java/com/android/server/StorageManagerService.java +++ b/services/core/java/com/android/server/StorageManagerService.java @@ -4072,7 +4072,7 @@ class StorageManagerService extends IStorageManager.Stub || (includeSharedProfile && vol.isVisibleForWrite(userIdSharingMedia)); } else { match = vol.isVisibleForUser(userId) - || (includeInvisible && vol.getPath() != null) + || (!vol.isVisible() && includeInvisible && vol.getPath() != null) || (includeSharedProfile && vol.isVisibleForRead(userIdSharingMedia)); } if (!match) continue; -- cgit v1.2.3-59-g8ed1b