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

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

Merge "Use the application\'s usesCleartextTraffic flag" 

am: d16f5f12

* commit 'd16f5f12':
  Use the application's usesCleartextTraffic flag
parents 15ea45c8 d16f5f12

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

+13 −2
Original line number Original line Diff line number Diff line
@@ -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