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

Commit 2dfd5c37 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Docs: clarify WebView support for cleartext traffic"

parents bf481806 6a2a541f

core/java/android/content/pm/ApplicationInfo.java

+1 −1
Original line number Diff line number Diff line
@@ -375,7 +375,7 @@ public class ApplicationInfo extends PackageItemInfo implements Parcelable { 
     * {@code DownloadManager}, {@code MediaPlayer}) will refuse app's requests to use cleartext

     * traffic. Third-party libraries are encouraged to honor this flag as well.

     *

     * <p>NOTE: {@code WebView} does not honor this flag.

     * <p>NOTE: {@code WebView} honors this flag for applications targeting API level 26 and up.

     *

     * <p>This flag is ignored on Android N and above if an Android Network Security Config is

     * present.

core/java/android/security/NetworkSecurityPolicy.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package android.security;



import android.annotation.TestApi;

import android.content.Context;

import android.content.pm.PackageManager;

import android.security.net.config.ApplicationConfig;
@@ -63,7 +62,8 @@ public class NetworkSecurityPolicy { 
     * traffic from applications is handled by higher-level network stacks/components which can

     * honor this aspect of the policy.

     *

     * <p>NOTE: {@link android.webkit.WebView} does not honor this flag.

     * <p>NOTE: {@link android.webkit.WebView} honors this flag for applications targeting API level

     * 26 and up.

     */

    public boolean isCleartextTrafficPermitted() {

        return libcore.net.NetworkSecurityPolicy.getInstance().isCleartextTrafficPermitted();