Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use the application\'s usesCleartextTraffic flag"

Browse Source 
am: d16f5f121e

* commit 'd16f5f121e560d9f18411cbdd3fa4fb48681c0c2':
  Use the application's usesCleartextTraffic flag
This commit is contained in:
Chad Brubaker
2015-12-14 11:57:29 -08:00
committed by android-build-merger
parent 15ea45c848 d16f5f121e
commit a1c0bea895
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/security/net/config/ManifestConfigSource.java
View File

@@ -79,7 +79,9 @@ public class ManifestConfigSource implements ConfigSource {
if (DBG) { if (DBG) {
Log.d(LOG_TAG, "No Network Security Config specified, using platform default"); Log.d(LOG_TAG, "No Network Security Config specified, using platform default");
} }
source = new DefaultConfigSource(); boolean usesCleartextTraffic =
(info.flags & ApplicationInfo.FLAG_USES_CLEARTEXT_TRAFFIC) != 0;
source = new DefaultConfigSource(usesCleartextTraffic);
} }
mConfigSource = source; mConfigSource = source;
return mConfigSource; return mConfigSource;
@@ -87,9 +89,18 @@ public class ManifestConfigSource implements ConfigSource {
} }
private static final class DefaultConfigSource implements ConfigSource { private static final class DefaultConfigSource implements ConfigSource {
private final NetworkSecurityConfig mDefaultConfig;
public DefaultConfigSource(boolean usesCleartextTraffic) {
mDefaultConfig = NetworkSecurityConfig.getDefaultBuilder()
.setCleartextTrafficPermitted(usesCleartextTraffic)
.build();
}
@Override @Override
public NetworkSecurityConfig getDefaultConfig() { public NetworkSecurityConfig getDefaultConfig() {
return NetworkSecurityConfig.DEFAULT; return mDefaultConfig;
} }
@Override @Override