Merge "Check for null path in getInternalPathForUser" am: 0559afdbcc (8c5a3622) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -312,7 +312,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 {