Merge "MediaStore.Audio.Media.getContentUriForPath() returns unexpected content" (69abccc3) · Commits · e / os / android_frameworks_base

core/java/android/provider/MediaStore.java

+18 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1324,6 +1324,18 @@ public final class MediaStore {
	}		}

	public static final class Media implements AudioColumns {		public static final class Media implements AudioColumns {

			private static final String[] EXTERNAL_PATHS;

			static {
			String secondary_storage = System.getenv("SECONDARY_STORAGE");
			if (secondary_storage != null) {
			EXTERNAL_PATHS = secondary_storage.split(":");
			} else {
			EXTERNAL_PATHS = new String[0];
			}
			}

	/**		/**
	* Get the content:// style URI for the audio media table on the		* Get the content:// style URI for the audio media table on the
	* given volume.		* given volume.
	@@ -1337,6 +1349,12 @@ public final class MediaStore {
	}		}

	public static Uri getContentUriForPath(String path) {		public static Uri getContentUriForPath(String path) {
			for (String ep : EXTERNAL_PATHS) {
			if (path.startsWith(ep)) {
			return EXTERNAL_CONTENT_URI;
			}
			}

	return (path.startsWith(Environment.getExternalStorageDirectory().getPath()) ?		return (path.startsWith(Environment.getExternalStorageDirectory().getPath()) ?
	EXTERNAL_CONTENT_URI : INTERNAL_CONTENT_URI);		EXTERNAL_CONTENT_URI : INTERNAL_CONTENT_URI);
	}		}