commit 533559234e09c87395e349e5c7939bc7da7c3154
author Benedict Wong <benedictwong@google.com> Mon Apr 29 13:35:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Mon Apr 29 13:35:37 2019 -0700
tree bc7edbb0ece85c8bd8328a70672642a060500fad
parent 70e5117542c830ccac024ea4b84baeda7183d6fe
parent 7e9c1ceadd93d26fc1035faed701d4080d7d61d4

Merge "Add EPROTONOSUPPORT to IpSecManager SSE map"
am: 7050ce9434

Change-Id: I9ab4161e2b04615ce782c89cd9e99d98cdbdc92d

core/java/android/net/IpSecManager.java

diff --git a/core/java/android/net/IpSecManager.java b/core/java/android/net/IpSecManager.java
index d4c3edc..889e9bc 100644
--- a/core/java/android/net/IpSecManager.java
+++ b/core/java/android/net/IpSecManager.java
@@ -941,7 +941,8 @@
             throw new IllegalArgumentException(sse);
         } else if (sse.errorCode == OsConstants.EAGAIN) {
             throw new IllegalStateException(sse);
-        } else if (sse.errorCode == OsConstants.EOPNOTSUPP) {
+        } else if (sse.errorCode == OsConstants.EOPNOTSUPP
+                || sse.errorCode == OsConstants.EPROTONOSUPPORT) {
             throw new UnsupportedOperationException(sse);
         }
     }