Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Automatically add FEATURE_IPSEC_TUNNEL_MIGRATION for U/U+ devices." am: 3653fce54c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1634882

Change-Id: Ifb2807c681e36222f456863b57ef233923ea5694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yan Yan
2023-01-12 18:51:05 +00:00
committed by Automerger Merge Worker
parent d9d3ff4145 3653fce54c
commit ae1693117c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/server/SystemConfig.java
View File

@@ -1521,6 +1521,8 @@ public class SystemConfig {
addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0); addFeature(PackageManager.FEATURE_IPSEC_TUNNELS, 0);
} }
enableIpSecTunnelMigrationOnVsrUAndAbove();
if (isErofsSupported()) { if (isErofsSupported()) {
if (isKernelVersionAtLeast(5, 10)) { if (isKernelVersionAtLeast(5, 10)) {
addFeature(PackageManager.FEATURE_EROFS, 0); 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) { private void addFeature(String name, int version) {
FeatureInfo fi = mAvailableFeatures.get(name); FeatureInfo fi = mAvailableFeatures.get(name);
if (fi == null) { if (fi == null) {