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 b8b3bf0747fefd3ddf9dfba20f18d31d705cf626..5e9fd1b80c8981eaa3f7c69c34a00b7f67d1da18 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,18 +344,13 @@ |
AwContents.setAwDrawGLFunctionTable(GraphicsUtils.getDrawGLFunctionTable()); |
} |
- private void doNetworkInitializations(Context applicationContext) { |
+ private void initNetworkChangeNotifier(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) { |
@@ -427,7 +422,7 @@ |
final Context context = ContextUtils.getApplicationContext(); |
setUpResources(webViewPackageName, context); |
initPlatSupportLibrary(); |
- doNetworkInitializations(context); |
+ initNetworkChangeNotifier(context); |
final boolean isExternalService = true; |
AwBrowserProcess.configureChildProcessLauncher(webViewPackageName, isExternalService); |
AwBrowserProcess.start(); |