commit abc39ad1b0e9b1714c5d943702be152c923e116b
author Narayan Kamath <narayan@google.com> Thu Jul 09 12:38:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Jul 09 12:38:46 2015 +0000
tree 41c1b224367b098e38d036051d37b164a5915044
parent b3697ef2fcef7f054e8468b2f009ae9781f7450a
parent 495081c7ed601dc37904961f544704f7d20cd77c

am 495081c7: Merge "Add EUSERS to OsConstants."

* commit '495081c7ed601dc37904961f544704f7d20cd77c':
  Add EUSERS to OsConstants.

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 42b0427..0908b88 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -238,6 +238,7 @@
     public static final int ETIME = placeholder();
     public static final int ETIMEDOUT = placeholder();
     public static final int ETXTBSY = placeholder();
+    /** @hide */ public static final int EUSERS = placeholder();
     // On Linux, EWOULDBLOCK == EAGAIN. Use EAGAIN instead, to reduce confusion.
     public static final int EXDEV = placeholder();
     public static final int EXIT_FAILURE = 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 b84cf5a..3cc9b06 100644
--- a/luni/src/main/native/android_system_OsConstants.cpp
+++ b/luni/src/main/native/android_system_OsConstants.cpp
@@ -212,6 +212,7 @@
     initConstant(env, c, "ETIME", ETIME);
     initConstant(env, c, "ETIMEDOUT", ETIMEDOUT);
     initConstant(env, c, "ETXTBSY", ETXTBSY);
+    initConstant(env, c, "EUSERS", EUSERS);
 #if EWOULDBLOCK != EAGAIN
 #error EWOULDBLOCK != EAGAIN
 #endif