commit 1347cb81f402c628f3346ea350a5862749901d59
author Chad Brubaker <cbrubaker@google.com> Sat Nov 07 02:37:45 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Nov 07 02:37:45 2015 +0000
tree 40468dd186a0f85dc9cc05ceb78d5c09ea8efaf3
parent 1483ee3aa5737f9aff06021b5ec9fe3086ee2e66
parent 825c3f91ed4b0bdfc0043a0e728a7fce556e5ecb

Merge "Fix incorrect hstsEnforced lookup"

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

diff --git a/core/java/android/security/net/config/NetworkSecurityConfig.java b/core/java/android/security/net/config/NetworkSecurityConfig.java
index 0a4ce11..1c787b4 100644
--- a/core/java/android/security/net/config/NetworkSecurityConfig.java
+++ b/core/java/android/security/net/config/NetworkSecurityConfig.java
@@ -233,7 +233,7 @@
 
         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);