diff options
| author | 2017-10-24 19:28:37 +0000 | |
|---|---|---|
| committer | 2017-10-24 19:28:37 +0000 | |
| commit | a0813265d41e22dd69ec8474f9f8fee5c82108d5 (patch) | |
| tree | 86fc6223cca945e04787436e00304883f1223b27 | |
| parent | 0f81441edf3cb9f3c911d272e5f23284e1351c9b (diff) | |
| parent | fcc46336014d59cb9f28ae0543ad855a9e01bdf4 (diff) | |
Merge "Change cleartext traffic permitted default for P apps"
| -rw-r--r-- | core/java/android/security/net/config/NetworkSecurityConfig.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/core/java/android/security/net/config/NetworkSecurityConfig.java b/core/java/android/security/net/config/NetworkSecurityConfig.java index b9e550540217..52f48ef8499b 100644 --- a/core/java/android/security/net/config/NetworkSecurityConfig.java +++ b/core/java/android/security/net/config/NetworkSecurityConfig.java @@ -164,7 +164,8 @@ public final class NetworkSecurityConfig { * <p> * The default configuration has the following properties: * <ol> - * <li>Cleartext traffic is permitted for non-ephemeral apps.</li> + * <li>If the application targets API level 27 (Android O MR1) or lower then cleartext traffic + * is allowed by default.</li> * <li>Cleartext traffic is not permitted for ephemeral apps.</li> * <li>HSTS is not enforced.</li> * <li>No certificate pinning is used.</li> @@ -183,7 +184,8 @@ public final class NetworkSecurityConfig { // System certificate store, does not bypass static pins. .addCertificatesEntryRef( new CertificatesEntryRef(SystemCertificateSource.getInstance(), false)); - final boolean cleartextTrafficPermitted = info.targetSandboxVersion < 2; + final boolean cleartextTrafficPermitted = info.targetSdkVersion < Build.VERSION_CODES.P + && info.targetSandboxVersion < 2; builder.setCleartextTrafficPermitted(cleartextTrafficPermitted); // Applications targeting N and above must opt in into trusting the user added certificate // store. |