Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix CTS Test Dual Stack Test Passing Issue"

Browse Source 
am: ae81e15c9c

Change-Id: I30778e45730e79bc071344fb31fd0038d739ee9d
This commit is contained in:
Manoj Boopathi Raj
2018-01-04 18:51:12 +00:00
committed by android-build-merger
parent 412aecc2b0 ae81e15c9c
commit a19acb6ac8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/core/java/com/android/server/IpSecService.java
View File

@@ -19,6 +19,7 @@ package com.android.server;
import static android.Manifest.permission.DUMP;
import static android.net.IpSecManager.INVALID_RESOURCE_ID;
import static android.system.OsConstants.AF_INET;
import static android.system.OsConstants.EINVAL;
import static android.system.OsConstants.IPPROTO_UDP;
import static android.system.OsConstants.SOCK_DGRAM;
import static com.android.internal.util.Preconditions.checkNotNull;
@@ -1220,7 +1221,11 @@ public class IpSecService extends IIpSecService.Stub {
info.getSpiRecord(direction).getSpi());
}
} catch (ServiceSpecificException e) {
// FIXME: get the error code and throw is at an IOException from Errno Exception
if (e.errorCode == EINVAL) {
throw new IllegalArgumentException(e.toString());
} else {
throw e;
}
}
}