Merge "Fix CTS Test Dual Stack Test Passing Issue" am: ae81e15c9c am: a19acb6ac8 (26f27074) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/IpSecService.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}
		}