Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c5a3622 authored by Jerry Zhang's avatar Jerry Zhang Committed by android-build-merger
Browse files

Merge "Check for null path in getInternalPathForUser" am: 0559afdb 

am: c2861c56

Change-Id: I2159b0ebe93cab917f27597ffeb446f4f49347dd
parents a09d6318 c2861c56

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

+3 −1
Original line number Diff line number Diff line
@@ -312,7 +312,9 @@ public class VolumeInfo implements Parcelable { 
     * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}.

     */

    public File getInternalPathForUser(int userId) {

        if (type == TYPE_PUBLIC) {

        if (path == null) {

            return null;

        } else if (type == TYPE_PUBLIC) {

            // TODO: plumb through cleaner path from vold

            return new File(path.replace("/storage/", "/mnt/media_rw/"));

        } else {