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

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

Issue 2546213003: Implement net/ support for Android's NetworkSecurityPolicy (Closed)
Patch Set: fixes 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
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..d33321c0202ce72c96f49d9f1c3c693520aaa372 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,21 @@ class AndroidNetworkLibrary {
}
return "";
}
+
+ /**
+ * Returns true if cleartext traffic to |host| is allowed by the current app. Always true on L
+ * and older.
+ */
+ @TargetApi(Build.VERSION_CODES.N)
+ @CalledByNative
+ private static boolean isCleartextPermitted(String host) {
+ 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;
+ }
}

Powered by Google App Engine
This is Rietveld 408576698