Snap for 5518923 from d480edf1f79c13bcc201768a39a1b4495c3f1ed0 to rvc-release

Change-Id: I553015efeb0e6a92a42bc9a9f34695f407cdcd00
2019-05-01 03:06:23 +00:00
parent 4e276ebeb2 e6096f4b8e
commit 0625be3e26
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/net/IpSecManager.java
+++ b/core/java/android/net/IpSecManager.java
@@ -947,7 +947,8 @@ public final class IpSecManager {
            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);
        }
    }