commit e7401756b2ba806c4ae4a8a56d41680b0e82c132
author Gustav Sennton <gsennton@google.com> Mon Apr 09 20:29:23 2018 +0100
committer Aurimas Liutikas <aurimas@google.com> Mon Apr 09 21:02:50 2018 +0000
tree 53d638fc7ef7926ed5e683af86cc17492e843742
parent 6b9b97bf8ac55ba283f6b8f27fd2928a9834a835

[WebView Support lib] Fix warnings and turn on failOnUncheckedWarnings

We currently have a few javac xlint warnings in the webkit/ module. This
CL fixes those warnings and turns on a flag 'failOnUncheckedWarnings' to
catch such warnings during presubmit in the future.

Bug: 77554289
Test: compile webkit module.
Change-Id: I9beaab49f86a44733b069ddb499d0be71cd6d082

webkit/build.gradle

diff --git a/webkit/build.gradle b/webkit/build.gradle
index 78a585e..d610dad 100644
--- a/webkit/build.gradle
+++ b/webkit/build.gradle
@@ -51,5 +51,4 @@
     mavenGroup = LibraryGroups.WEBKIT
     inceptionYear = "2017"
     description = "The WebView Support Library is a static library you can add to your Android application in order to use android.webkit APIs that are not available for older platform versions."
-    failOnUncheckedWarnings = false
 }

webkit/src/main/java/androidx/webkit/WebViewCompat.java

diff --git a/webkit/src/main/java/androidx/webkit/WebViewCompat.java b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
index 7cb0bfd..f09feea 100644
--- a/webkit/src/main/java/androidx/webkit/WebViewCompat.java
+++ b/webkit/src/main/java/androidx/webkit/WebViewCompat.java
@@ -258,7 +258,7 @@
     private static PackageInfo getLoadedWebViewPackageInfo()
             throws ClassNotFoundException, NoSuchMethodException, InvocationTargetException,
             IllegalAccessException {
-        Class webViewFactoryClass = Class.forName("android.webkit.WebViewFactory");
+        Class<?> webViewFactoryClass = Class.forName("android.webkit.WebViewFactory");
         PackageInfo webviewPackageInfo =
                 (PackageInfo) webViewFactoryClass.getMethod(
                         "getLoadedPackageInfo").invoke(null);
@@ -274,13 +274,13 @@
         try {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP
                     && Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
-                Class webViewFactoryClass = null;
+                Class<?> webViewFactoryClass = null;
                 webViewFactoryClass = Class.forName("android.webkit.WebViewFactory");
 
                 webviewPackageName = (String) webViewFactoryClass.getMethod(
                         "getWebViewPackageName").invoke(null);
             } else {
-                Class webviewUpdateServiceClass =
+                Class<?> webviewUpdateServiceClass =
                         Class.forName("android.webkit.WebViewUpdateService");
                 webviewPackageName = (String) webviewUpdateServiceClass.getMethod(
                         "getCurrentWebViewPackageName").invoke(null);