Add targetsAtLeastO() helper function
This adds the targetsAtLeastO() helper function to BuildInfo. I also
updated the check we were using for HTTPS clear text to use this
instead of manually checking targetSdkVersion.
This helper should be updated once the SDK level for O has been
finalized.
BUG=688556
Review-Url: https://codereview.chromium.org/2745663002
Cr-Original-Commit-Position: refs/heads/master@{#456128}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 5f8b72e3c433990df81374e7a68144069da8d7d9
diff --git a/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index cdce14a..fffde31 100644
--- a/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/java/src/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -335,10 +335,7 @@
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);
+ AwContentsStatics.setCheckClearTextPermitted(BuildInfo.targetsAtLeastO(applicationContext));
}
private void ensureChromiumStartedLocked(boolean onMainThread) {
