diff options
| author | 2015-11-07 02:42:05 +0000 | |
|---|---|---|
| committer | 2015-11-07 02:42:05 +0000 | |
| commit | 90b9ed5c82f5a3bd754bebe69a8883b65d3f95cc (patch) | |
| tree | d440d291c154465ba95aed933bc061910d1ab155 | |
| parent | 2d7d8401a9c1e03f8f141415b25cfb415df73695 (diff) | |
| parent | 1347cb81f402c628f3346ea350a5862749901d59 (diff) | |
Merge "Fix incorrect hstsEnforced lookup"
am: 1347cb81f4
* commit '1347cb81f402c628f3346ea350a5862749901d59':
Fix incorrect hstsEnforced lookup
| -rw-r--r-- | core/java/android/security/net/config/NetworkSecurityConfig.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/security/net/config/NetworkSecurityConfig.java b/core/java/android/security/net/config/NetworkSecurityConfig.java index 0a4ce1126d05..1c787b407086 100644 --- a/core/java/android/security/net/config/NetworkSecurityConfig.java +++ b/core/java/android/security/net/config/NetworkSecurityConfig.java @@ -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); |