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

Merge "Docs: clarify WebView support for cleartext traffic"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-24 23:07:00 +00:00
committed by Android (Google) Code Review
parent bf481806c8 6a2a541fb1
commit 2dfd5c375e
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/content/pm/ApplicationInfo.java
View File

@@ -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.

4
core/java/android/security/NetworkSecurityPolicy.java
View File

@@ -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();