Return valid path for secondary storage devices.

Bug: 122900949
Test: manual
Change-Id: I3ce5ca49720dc1854dd5207d29f59fa85821f23e

1 files changed, 3 insertions, 1 deletions

diff --git a/core/java/android/provider/MediaStore.java b/core/java/android/provider/MediaStore.java
index cdbc9790c952..554e42ecc019 100644
--- a/core/java/android/provider/MediaStore.java
+++ b/core/java/android/provider/MediaStore.java
@@ -2947,7 +2947,9 @@ public final class MediaStore {
         for (VolumeInfo vi : sm.getVolumes()) {
             if (Objects.equals(vi.getFsUuid(), volumeName)) {
                 final File path = vi.getPathForUser(UserHandle.myUserId());
-                if (path == null) {
+                if (path != null) {
+                    return path;
+                } else {
                     throw new FileNotFoundException("Failed to find path for " + vi);
                 }
             }