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

Commit d28d4bcf authored by Chad Brubaker's avatar Chad Brubaker Committed by android-build-merger
Browse files

Merge "Fix incorrect hstsEnforced lookup" am: 1347cb81 

am: 90b9ed5c

* commit '90b9ed5c':
  Fix incorrect hstsEnforced lookup
parents a8fd3566 90b9ed5c

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

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ public final class NetworkSecurityConfig { 


        public NetworkSecurityConfig build() {

            boolean cleartextPermitted = getEffectiveCleartextTrafficPermitted();

            boolean hstsEnforced = getEffectiveCleartextTrafficPermitted();

            boolean hstsEnforced = getEffectiveHstsEnforced();

            PinSet pinSet = getEffectivePinSet();

            List<CertificatesEntryRef> entryRefs = getEffectiveCertificatesEntryRefs();

            return new NetworkSecurityConfig(cleartextPermitted, hstsEnforced, pinSet, entryRefs);