Merge "Only return internal path when not visible." into pi-dev

am: 2254fe2e04

Change-Id: I7e90be19432f3ac8e0ec9b878f31416dca6c1e4a

core/java/android/os/storage/VolumeInfo.java

@@ -312,7 +312,7 @@ public class VolumeInfo implements Parcelable {
      * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}.
      */
     public File getInternalPathForUser(int userId) {
-        if (type == TYPE_PUBLIC) {
+        if (type == TYPE_PUBLIC && !isVisible()) {
             // TODO: plumb through cleaner path from vold
             return new File(path.replace("/storage/", "/mnt/media_rw/"));
         } else {