Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check for null path in getInternalPathForUser"

Browse Source
This commit is contained in:
Treehugger Robot
2018-06-08 20:16:14 +00:00
committed by Gerrit Code Review
parent c2791389a5 30f63cf1f9
commit 0559afdbcc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/os/storage/VolumeInfo.java
View File

@@ -318,7 +318,9 @@ public class VolumeInfo implements Parcelable {
* {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}. * {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}.
*/ */
public File getInternalPathForUser(int userId) { 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 // TODO: plumb through cleaner path from vold
return new File(path.replace("/storage/", "/mnt/media_rw/")); return new File(path.replace("/storage/", "/mnt/media_rw/"));
} else { } else {