From 531aa1999142482180c7741e34a05b8268c3eac3 Mon Sep 17 00:00:00 2001 From: Benedict Wong 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 Merged-In: 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 475981811b778..be1524689c1c2 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -1015,6 +1015,10 @@ public class SystemConfig { addFeature(PackageManager.FEATURE_RAM_NORMAL, 0); } + if (Build.VERSION.FIRST_SDK_INT >= Build.VERSION_CODES.Q) { + addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0); + } + for (String featureName : mUnavailableFeatures) { removeFeature(featureName); }