Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3653fce5 authored by Yan Yan's avatar Yan Yan Committed by Gerrit Code Review
Browse files

Merge "Automatically add FEATURE_IPSEC_TUNNEL_MIGRATION for U/U+ devices."

parents 268ecb06 3804613f

core/java/com/android/server/SystemConfig.java

+14 −0
Original line number Diff line number Diff line
@@ -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) {