From e613309f7689edb1dded4c29cb30a2b461fe7ab6 Mon Sep 17 00:00:00 2001
From: Benedict Wong <benedictwong@google.com>
Date: Thu, 28 May 2020 19:27:54 -0700
Subject: [PATCH] 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
---
 core/java/com/android/server/SystemConfig.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java
index 21ca948fa89cb..d9ca9c2f87f55 100644
--- a/core/java/com/android/server/SystemConfig.java
+++ b/core/java/com/android/server/SystemConfig.java
@@ -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);
         }