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

Commit f508adbd authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove references to flag android.sdk.major_minor_versioning_scheme" into main

parents 27576037 81b4c384

core/java/android/security/net/config/NetworkSecurityConfig.java

+0 −3
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.security.net.config;



import static android.sdk.Flags.majorMinorVersioningScheme;



import static com.android.org.conscrypt.net.flags.Flags.certificateTransparencyDefaultEnabled;



import android.annotation.FlaggedApi;
@@ -201,7 +199,6 @@ public final class NetworkSecurityConfig { 
                        defaultEnabled != null

                                ? defaultEnabled

                                : certificateTransparencyDefaultEnabled()

                                        && majorMinorVersioningScheme()

                                        && CompatChanges.isChangeEnabled(

                                                DEFAULT_ENABLE_CERTIFICATE_TRANSPARENCY));

    }