Merge "Automatically add FEATURE_IPSEC_TUNNELS for Q+ devices." am: ff22e5f83c

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1320295 Change-Id: Ibb7678508b3ea8ccb903906eb2cc453fcb357c1d
2020-06-15 11:10:16 +00:00
parent d50b247feb ff22e5f83c
commit f85385c8de
1 changed files with 4 additions and 0 deletions
--- 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);
        }