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

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

Merge "Use the application\'s usesCleartextTraffic flag" am: d16f5f12 

am: a1c0bea8

* commit 'a1c0bea8':
  Use the application's usesCleartextTraffic flag
parents 4b4a2529 a1c0bea8

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

+13 −2
Original line number Diff line number Diff line
@@ -79,7 +79,9 @@ public class ManifestConfigSource implements ConfigSource { 
                if (DBG) {

                    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;

            return mConfigSource;
@@ -87,9 +89,18 @@ public class ManifestConfigSource implements ConfigSource { 
    }



    private static final class DefaultConfigSource implements ConfigSource {



        private final NetworkSecurityConfig mDefaultConfig;



        public DefaultConfigSource(boolean usesCleartextTraffic) {

            mDefaultConfig = NetworkSecurityConfig.getDefaultBuilder()

                    .setCleartextTrafficPermitted(usesCleartextTraffic)

                    .build();

       }



        @Override

        public NetworkSecurityConfig getDefaultConfig() {

            return NetworkSecurityConfig.DEFAULT;

            return mDefaultConfig;

        }



        @Override