Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
index 5e9fd1b80c8981eaa3f7c69c34a00b7f67d1da18..b8b3bf0747fefd3ddf9dfba20f18d31d705cf626 100644 |
--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java |
@@ -344,13 +344,18 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { |
AwContents.setAwDrawGLFunctionTable(GraphicsUtils.getDrawGLFunctionTable()); |
} |
- private void initNetworkChangeNotifier(Context applicationContext) { |
+ private void doNetworkInitializations(Context applicationContext) { |
if (applicationContext.checkPermission(Manifest.permission.ACCESS_NETWORK_STATE, |
Process.myPid(), Process.myUid()) == PackageManager.PERMISSION_GRANTED) { |
NetworkChangeNotifier.init(applicationContext); |
NetworkChangeNotifier.setAutoDetectConnectivityState( |
new AwNetworkChangeNotifierRegistrationPolicy()); |
} |
+ |
+ int targetSdkVersion = applicationContext.getApplicationInfo().targetSdkVersion; |
+ // TODO(sgurun) We need to change this to > N_MR1 when we roll N_MR1 sdk or |
+ // >= O when we roll O SDK to upstream. crbug/688556 |
+ AwContentsStatics.setCheckClearTextPermitted(targetSdkVersion > 25); |
} |
private void ensureChromiumStartedLocked(boolean onMainThread) { |
@@ -422,7 +427,7 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider { |
final Context context = ContextUtils.getApplicationContext(); |
setUpResources(webViewPackageName, context); |
initPlatSupportLibrary(); |
- initNetworkChangeNotifier(context); |
+ doNetworkInitializations(context); |
final boolean isExternalService = true; |
AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, isExternalService); |
AwBrowserProcess.start(); |