Commit e613309f authored May 28, 2020 by Benedict Wong

Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices.

This change automatically enables the IPSEC_TUNNELS mandatory feature
for devices launching with or above Q.

This is for OEM convenience to ensure that they do not have to add the
feature for each device that they ship.

Bug: 156711979
Test: Removed feature from device, CTS tested
Change-Id: I9d1a0e9616cdc7089a9bef7c96ff3780de36ed8d

parent 29d64121

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);
		}