diff options
| -rw-r--r-- | core/java/com/android/server/SystemConfig.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/core/java/com/android/server/SystemConfig.java b/core/java/com/android/server/SystemConfig.java index 00b01051adae..088c0016c0da 100644 --- a/core/java/com/android/server/SystemConfig.java +++ b/core/java/com/android/server/SystemConfig.java @@ -1521,6 +1521,8 @@ public class SystemConfig { addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0); } + enableIpSecTunnelMigrationOnVsrUAndAbove(); + if (isErofsSupported()) { if (isKernelVersionAtLeast(5, 10)) { addFeature(PackageManager.FEATURE_EROFS, 0); @@ -1534,6 +1536,18 @@ public class SystemConfig { } } + // This method only enables a new Android feature added in U and will not have impact on app + // compatibility + @SuppressWarnings("AndroidFrameworkCompatChange") + private void enableIpSecTunnelMigrationOnVsrUAndAbove() { + final int vsrApi = + SystemProperties.getInt( + "ro.vendor.api_level", Build.VERSION.DEVICE_INITIAL_SDK_INT); + if (vsrApi > Build.VERSION_CODES.TIRAMISU) { + addFeature(PackageManager.FEATURE_IPSEC_TUNNEL_MIGRATION, 0); + } + } + private void addFeature(String name, int version) { FeatureInfo fi = mAvailableFeatures.get(name); if (fi == null) { |