commit 4c1a4a30822756276f043eefb666e9a0adac3331
author Neil Fuller <nfuller@google.com> Mon Jul 06 09:56:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 06 09:56:44 2015 +0000
tree 4ce54c223362ee58f314dfa46823ca7b2e6d5661
parent 26f0a1cee21cd463f5ecfa6333c688cd515e23ad
parent bfa4c45506e9db20be6cfc58bf3ae5d2837c21bb

am bfa4c455: Merge "Add OsConstants.TIOCOUTQ"

* commit 'bfa4c45506e9db20be6cfc58bf3ae5d2837c21bb':
  Add OsConstants.TIOCOUTQ

luni/src/main/java/android/system/OsConstants.java

diff --git a/luni/src/main/java/android/system/OsConstants.java b/luni/src/main/java/android/system/OsConstants.java
index 8832f3d..11e5d22 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -489,6 +489,7 @@
     public static final int S_IXOTH = placeholder();
     public static final int S_IXUSR = placeholder();
     public static final int TCP_NODELAY = placeholder();
+    /** @hide */ public static final int TIOCOUTQ = placeholder();
     public static final int WCONTINUED = placeholder();
     public static final int WEXITED = placeholder();
     public static final int WNOHANG = placeholder();

luni/src/main/native/android_system_OsConstants.cpp

diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp
index a11ea76..38d9129 100644
--- a/luni/src/main/native/android_system_OsConstants.cpp
+++ b/luni/src/main/native/android_system_OsConstants.cpp
@@ -550,6 +550,7 @@
     initConstant(env, c, "S_IXOTH", S_IXOTH);
     initConstant(env, c, "S_IXUSR", S_IXUSR);
     initConstant(env, c, "TCP_NODELAY", TCP_NODELAY);
+    initConstant(env, c, "TIOCOUTQ", TIOCOUTQ);
     initConstant(env, c, "WCONTINUED", WCONTINUED);
     initConstant(env, c, "WEXITED", WEXITED);
     initConstant(env, c, "WNOHANG", WNOHANG);