LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Enforce IPsec Tunnel mode for Android Q" am: 81e51bce50

Browse Source 
am: ad380770a3

Change-Id: I545444bb483b0f5de45d00a07dc45aeb9e9cbdf7
This commit is contained in:
Benedict Wong
2019-05-10 11:05:43 -07:00
committed by android-build-merger
parent 305873fdd9 ad380770a3
commit d2465991d9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/cts/net/src/android/net/cts/IpSecManagerTunnelTest.java
View File

@@ -55,8 +55,10 @@ import android.net.TestNetworkInterface;
import android.net.TestNetworkManager; import android.net.TestNetworkManager;
import android.net.cts.PacketUtils.Payload; import android.net.cts.PacketUtils.Payload;
import android.os.Binder; import android.os.Binder;
import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.os.ParcelFileDescriptor; import android.os.ParcelFileDescriptor;
import android.os.SystemProperties;
import androidx.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
@@ -167,7 +169,9 @@ public class IpSecManagerTunnelTest extends IpSecBaseTest {
} }
private static boolean hasTunnelsFeature() { 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) { private static void setAppop(int appop, boolean allow) {