summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2014-05-30 23:47:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-30 23:47:00 +0000
commit05dc18d69ad64254f2bcdd9c1e208ab54ee664fe (patch)
tree39fdc33974a041a24161e092757318f1ca447dad /api
parentae706066e1a9aa25c7d57619c0bf8ba24815d3d8 (diff)
parent2ee3c1e189819cc6efb4d7de24f1438bdb824087 (diff)
downloadframeworks_base-05dc18d69ad64254f2bcdd9c1e208ab54ee664fe.zip
frameworks_base-05dc18d69ad64254f2bcdd9c1e208ab54ee664fe.tar.gz
frameworks_base-05dc18d69ad64254f2bcdd9c1e208ab54ee664fe.tar.bz2
Merge "Per-app media directories on external storage." into lmp-preview-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 73decfb..265c682 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6902,6 +6902,7 @@ package android.content {
method public abstract java.io.File[] getExternalCacheDirs();
method public abstract java.io.File getExternalFilesDir(java.lang.String);
method public abstract java.io.File[] getExternalFilesDirs(java.lang.String);
+ method public abstract java.io.File[] getExternalMediaDirs();
method public abstract java.io.File getFileStreamPath(java.lang.String);
method public abstract java.io.File getFilesDir();
method public abstract android.os.Looper getMainLooper();
@@ -7070,6 +7071,7 @@ package android.content {
method public java.io.File[] getExternalCacheDirs();
method public java.io.File getExternalFilesDir(java.lang.String);
method public java.io.File[] getExternalFilesDirs(java.lang.String);
+ method public java.io.File[] getExternalMediaDirs();
method public java.io.File getFileStreamPath(java.lang.String);
method public java.io.File getFilesDir();
method public android.os.Looper getMainLooper();
@@ -28268,6 +28270,7 @@ package android.test.mock {
method public java.io.File[] getExternalCacheDirs();
method public java.io.File getExternalFilesDir(java.lang.String);
method public java.io.File[] getExternalFilesDirs(java.lang.String);
+ method public java.io.File[] getExternalMediaDirs();
method public java.io.File getFileStreamPath(java.lang.String);
method public java.io.File getFilesDir();
method public android.os.Looper getMainLooper();