commit aa4110366813f29f6a71dbdee090ba823feb2efe
author Marco Nelissen <marcone@google.com> Tue Jul 14 08:22:47 2015 -0700
committer Marco Nelissen <marcone@google.com> Tue Jul 14 08:25:23 2015 -0700
tree f5215c1a7292683da82503088f4b74d7391e29aa
parent 148c7c5c1794a9e306660f22c7cbbbc9906e5f5e

Use original path if translated path doesn't exist

Bug: 22376538
Change-Id: I2f6af4fa31c097e2e2d619a068cf83721091c450

core/java/android/os/storage/StorageManager.java

diff --git a/core/java/android/os/storage/StorageManager.java b/core/java/android/os/storage/StorageManager.java
index 140f317..320aa2c 100644
--- a/core/java/android/os/storage/StorageManager.java
+++ b/core/java/android/os/storage/StorageManager.java
@@ -950,7 +950,7 @@
                         || vol.getType() == VolumeInfo.TYPE_PUBLIC) && vol.isMountedReadable()) {
                     final File internalPath = FileUtils.rewriteAfterRename(vol.getPath(),
                             vol.getInternalPath(), path);
-                    if (internalPath != null) {
+                    if (internalPath != null && internalPath.exists()) {
                         return internalPath;
                     }
                 }