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

am 44fc8d5e: Merge "Add media directory, hidden for now." into jb-dev

Browse Source 
* commit '44fc8d5e20a7b202a7916bfa56a2b91c33e605c2':
  Add media directory, hidden for now.
This commit is contained in:
Jeff Sharkey
2012-05-22 19:12:39 -07:00
committed by Android Git Automerger
parent d52a4f68ea 44fc8d5e20
commit 5640e6a937
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/os/Environment.java
View File

@@ -93,6 +93,16 @@ public class Environment {
}
}
/**
* Return directory used for internal media storage, which is protected by
* {@link android.Manifest.permission#WRITE_MEDIA_STORAGE}.
*
* @hide
*/
public static File getMediaStorageDirectory() {
return MEDIA_STORAGE_DIRECTORY;
}
/**
* Returns whether the Encrypted File System feature is enabled on the device or not.
* @return <code>true</code> if Encrypted File System feature is enabled, <code>false</code>
@@ -112,6 +122,10 @@ public class Environment {
private static final File SECURE_DATA_DIRECTORY
= getDirectory("ANDROID_SECURE_DATA", "/data/secure");
/** @hide */
private static final File MEDIA_STORAGE_DIRECTORY
= getDirectory("MEDIA_STORAGE", "/data/media");
private static final File EXTERNAL_STORAGE_DIRECTORY
= getDirectory("EXTERNAL_STORAGE", "/storage/sdcard0");