Commit 65d9b899 authored Jun 15, 2020 by Lorenzo Colitti Committed by Automerger Merge Worker Jun 15, 2020

Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." into rvc-dev am: 242087ad

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11742658

Change-Id: I8f8b48bcdaaaef63efbc264cb479ee9a4d4ec134

parents c298524c 242087ad

core/java/com/android/server/SystemConfig.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -1197,6 +1197,10 @@ public class SystemConfig {
		addFeature(PackageManager.FEATURE_APP_ENUMERATION, 0);
		}

		if (Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.Q) {
		addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0);
		}

		for (String featureName : mUnavailableFeatures) {
		removeFeature(featureName);
		}