summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-10 03:29:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-10 03:29:54 +0000
commitf86468252fd4ceb5b4b0e37a4bdbcfea138cb303 (patch)
tree309e52a0c7d079ab55b9af852e04ce3522506902 /api
parentd1f35190da8850e429de5bef17230d7c665a51a4 (diff)
parentcd1fed2506241ad7b1a6dafb4ec5bb29aeed6baa (diff)
downloadframeworks_base-f86468252fd4ceb5b4b0e37a4bdbcfea138cb303.zip
frameworks_base-f86468252fd4ceb5b4b0e37a4bdbcfea138cb303.tar.gz
frameworks_base-f86468252fd4ceb5b4b0e37a4bdbcfea138cb303.tar.bz2
am 133d4e92: Merge "Fix Os.link apicheck breakage."
* commit '133d4e9291bb62658c6f9bf37ce914578f9d50e7': Fix Os.link apicheck breakage.
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 37a17d7..8400911 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -25788,6 +25788,7 @@ package android.system {
method public static boolean isatty(java.io.FileDescriptor);
method public static void kill(int, int) throws android.system.ErrnoException;
method public static void lchown(java.lang.String, int, int) throws android.system.ErrnoException;
+ method public static void link(java.lang.String, java.lang.String) throws android.system.ErrnoException;
method public static void listen(java.io.FileDescriptor, int) throws android.system.ErrnoException;
method public static long lseek(java.io.FileDescriptor, long, int) throws android.system.ErrnoException;
method public static android.system.StructStat lstat(java.lang.String) throws android.system.ErrnoException;