summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2013-09-20 22:59:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-20 22:59:12 +0000
commitd473ebb7c4f212cb9f74fe748bb8b95d7d126417 (patch)
tree6ccf61057915d90db2012e82fd067a2bf56a2723 /api
parentdfed244876d6c0ddd8d8bd2b8f3b970cd0a1ab95 (diff)
parenteb8c3f93edc826413ff4143284dec01c1061d5cc (diff)
downloadframeworks_base-d473ebb7c4f212cb9f74fe748bb8b95d7d126417.zip
frameworks_base-d473ebb7c4f212cb9f74fe748bb8b95d7d126417.tar.gz
frameworks_base-d473ebb7c4f212cb9f74fe748bb8b95d7d126417.tar.bz2
Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index f04bf40..2d4e840 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -18412,6 +18412,7 @@ package android.os {
method public long getStatSize();
method public static android.os.ParcelFileDescriptor open(java.io.File, int) throws java.io.FileNotFoundException;
method public static android.os.ParcelFileDescriptor open(java.io.File, int, android.os.Handler, android.os.ParcelFileDescriptor.OnCloseListener) throws java.io.IOException;
+ method public static int parseMode(java.lang.String);
method public void writeToParcel(android.os.Parcel, int);
field public static final android.os.Parcelable.Creator CREATOR;
field public static final int MODE_APPEND = 33554432; // 0x2000000