commit 6b7f0d7258692481041c2a9b1405edf826b4c730
author Erik Kline <ek@google.com> Fri Jun 19 01:31:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 19 01:31:50 2015 +0000
tree 71d11e86589e911a7746da28e1f1c1e8deeee003
parent 69b6dc0c242b6cc2b1caded8284d0ce845b8c9f7
parent 959a23e37abdfa26059e3770eacfe36dea8fc01c

Merge "Add ENONET 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 c0d31e5..6a99bb3 100644
--- a/luni/src/main/java/android/system/OsConstants.java
+++ b/luni/src/main/java/android/system/OsConstants.java
@@ -207,6 +207,7 @@
     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 @@
         if (errno == ENOMSG) {
             return "ENOMSG";
         }
+        if (errno == ENONET) {
+            return "ENONET";
+        }
         if (errno == ENOPROTOOPT) {
             return "ENOPROTOOPT";
         }

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 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 @@
     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);