Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Unified Diff: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java

Issue 2546213003: Implement net/ support for Android's NetworkSecurityPolicy (Closed)
Patch Set: Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | net/android/network_library.h » ('j') | net/android/network_library.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
diff --git a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
index 1656e2c38565ed038441a860e007ae0f9eb28304..261c1e0c0eb44bd61b610c0f0bd29a790d0ebb67 100644
--- a/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
+++ b/net/android/java/src/org/chromium/net/AndroidNetworkLibrary.java
@@ -17,6 +17,7 @@ import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;
import android.security.KeyChain;
+import android.security.NetworkSecurityPolicy;
import android.telephony.TelephonyManager;
import android.util.Log;
@@ -243,4 +244,16 @@ class AndroidNetworkLibrary {
}
return "";
}
+
+ @CalledByNative
pauljensen 2016/12/07 13:20:28 @TargetApi(Build.VERSION_CODES.N)
mgersh 2016/12/13 17:02:58 Done.
+ public static boolean isCleartextPermitted(String host) {
pauljensen 2016/12/07 13:20:28 private
pauljensen 2016/12/07 13:20:28 needs comment
mgersh 2016/12/13 17:02:58 Done.
mgersh 2016/12/13 17:02:58 Done.
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+ NetworkSecurityPolicy policy = NetworkSecurityPolicy.getInstance();
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+ return policy.isCleartextTrafficPermitted(host);
+ }
+ return policy.isCleartextTrafficPermitted();
+ }
+ return true;
+ }
}
« no previous file with comments | « no previous file | net/android/network_library.h » ('j') | net/android/network_library.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698