summaryrefslogtreecommitdiffstats
path: root/luni
diff options
context:
space:
mode:
authorErik Kline <ek@google.com>2015-06-18 18:14:36 +0900
committerErik Kline <ek@google.com>2015-06-24 16:15:00 +0900
commitbfa687ff9d7aa6cef970804cd1d82c042f15ff28 (patch)
tree0020207e800962d5512daa1ff97eb389f8db3fc6 /luni
parentc014d68efdf1523960a7bc8ee48a5fcb1984f388 (diff)
downloadlibcore-bfa687ff9d7aa6cef970804cd1d82c042f15ff28.zip
libcore-bfa687ff9d7aa6cef970804cd1d82c042f15ff28.tar.gz
libcore-bfa687ff9d7aa6cef970804cd1d82c042f15ff28.tar.bz2
Add ENONET to OsConstants
Bug: 19537384 Change-Id: I155f3db741bdac96f1ecb1ccb15b31faab85e819 (cherry picked from commit 959a23e37abdfa26059e3770eacfe36dea8fc01c)
Diffstat (limited to 'luni')
-rw-r--r--luni/src/main/java/android/system/OsConstants.java4
-rw-r--r--luni/src/main/native/android_system_OsConstants.cpp1
2 files changed, 5 insertions, 0 deletions
diff --git a/luni/src/main/java/android/system/OsConstants.java b/luni/src/main/java/android/system/OsConstants.java
index f70c7e1..dd6301b 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -207,6 +207,7 @@ public final class OsConstants {
public static final int ENOLINK = placeholder();
public static final int ENOMEM = placeholder();
public static final int ENOMSG = placeholder();
+ /** @hide */ public static final int ENONET = placeholder();
public static final int ENOPROTOOPT = placeholder();
public static final int ENOSPC = placeholder();
public static final int ENOSR = placeholder();
@@ -783,6 +784,9 @@ public final class OsConstants {
if (errno == ENOMSG) {
return "ENOMSG";
}
+ if (errno == ENONET) {
+ return "ENONET";
+ }
if (errno == ENOPROTOOPT) {
return "ENOPROTOOPT";
}
diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp
index a9031f4..a44d176 100644
--- a/luni/src/main/native/android_system_OsConstants.cpp
+++ b/luni/src/main/native/android_system_OsConstants.cpp
@@ -179,6 +179,7 @@ static void OsConstants_initConstants(JNIEnv* env, jclass c) {
initConstant(env, c, "ENOLINK", ENOLINK);
initConstant(env, c, "ENOMEM", ENOMEM);
initConstant(env, c, "ENOMSG", ENOMSG);
+ initConstant(env, c, "ENONET", ENONET);
initConstant(env, c, "ENOPROTOOPT", ENOPROTOOPT);
initConstant(env, c, "ENOSPC", ENOSPC);
initConstant(env, c, "ENOSR", ENOSR);