commit 81e51bce5056b3aeb999b83239b98a4f5b79c7e4
author Benedict Wong <benedictwong@google.com> Fri May 10 17:41:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 10 17:41:04 2019 +0000
tree 86b75322376c51e4a94121151679255f5c4402aa
parent 8982cb36d783e41938753d5d3773834aa213065d
parent 084c8b47b674afd17ae1f648b1d0f16006812bbf

Merge "Enforce IPsec Tunnel mode for Android Q"

tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java

diff --git a/tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java b/tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java
index e8c0a7a..6e96682 100644
--- a/tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java
+++ b/tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java
@@ -55,8 +55,10 @@
 import android.net.TestNetworkManager;
 import android.net.cts.PacketUtils.Payload;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
+import android.os.SystemProperties;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
@@ -167,7 +169,9 @@
     }
 
     private static boolean hasTunnelsFeature() {
-        return sContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_IPSEC_TUNNELS);
+        return sContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_IPSEC_TUNNELS)
+                || SystemProperties.getInt("ro.product.first_api_level", 0)
+                        >= Build.VERSION_CODES.Q;
     }
 
     private static void setAppop(int appop, boolean allow) {