fwb: webview: Add appropriate logging

By default, validity errors with webview packages
aren't floated to the logs, making webview silently
fail and diagnosis a pain. Fix it

Change-Id: Icbd7954bca3240a35bb72d7155e6732ad5e6b9f8

Author: USA-RedDragon

services/core/java/com/android/server/webkit/SystemImpl.java

@@ -49,6 +49,7 @@
  * @hide
  */
 public class SystemImpl implements SystemInterface {
+    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
     private static final String TAG = SystemImpl.class.getSimpleName();
     private static final String TAG_START = "webviewproviders";
     private static final String TAG_WEBVIEW_PROVIDER = "webviewprovider";
@@ -78,6 +79,7 @@ private SystemImpl() {
         try {
             parser = AppGlobals.getInitialApplication().getResources().getXml(
                     com.android.internal.R.xml.config_webview_packages);
+            if (DEBUG) Log.d(TAG, "Opening webview packages config");
             XmlUtils.beginDocument(parser, TAG_START);
             while(true) {
                 XmlUtils.nextElement(parser);
@@ -86,6 +88,7 @@ private SystemImpl() {
                     break;
                 }
                 if (element.equals(TAG_WEBVIEW_PROVIDER)) {
+                    if (DEBUG) Log.d(TAG, "Found webview provider tag");
                     String packageName = parser.getAttributeValue(null, TAG_PACKAGE_NAME);
                     if (packageName == null) {
                         throw new AndroidRuntimeException(
@@ -100,6 +103,7 @@ private SystemImpl() {
                             parser.getAttributeValue(null, TAG_AVAILABILITY));
                     boolean isFallback = "true".equals(
                             parser.getAttributeValue(null, TAG_FALLBACK));
+                    if (DEBUG) Log.d(TAG, "webview provider: packageName=" + packageName + " availableByDefault=" + availableByDefault);
                     WebViewProviderInfo currentProvider = new WebViewProviderInfo(
                             packageName, description, availableByDefault, isFallback,
                             readSignatures(parser));
@@ -117,6 +121,7 @@ private SystemImpl() {
                     if (currentProvider.availableByDefault) {
                         numAvailableByDefaultPackages++;
                     }
+                    if (DEBUG) Log.d(TAG, "adding webview provider to list: " + packageName);
                     webViewProviders.add(currentProvider);
                 }
                 else {
@@ -134,6 +139,7 @@ private SystemImpl() {
         }
         mWebViewProviderPackages =
                 webViewProviders.toArray(new WebViewProviderInfo[webViewProviders.size()]);
+        if (DEBUG) Log.d(TAG, "webview provider iteration finished, found: " + mWebViewProviderPackages);
     }
     /**
      * Returns all packages declared in the framework resources as potential WebView providers.

services/core/java/com/android/server/webkit/WebViewUpdateServiceImpl.java

@@ -21,6 +21,7 @@
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.Signature;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Trace;
 import android.os.UserHandle;
 import android.util.Slog;
@@ -65,6 +66,7 @@
  */
 class WebViewUpdateServiceImpl {
     private static final String TAG = WebViewUpdateServiceImpl.class.getSimpleName();
+    private static final boolean DEBUG = Build.IS_DEBUGGABLE;
 
     private static class WebViewPackageMissingException extends Exception {
         WebViewPackageMissingException(String message) {
@@ -389,13 +391,17 @@ private static class ProviderAndPackageInfo {
 
     private ProviderAndPackageInfo[] getValidWebViewPackagesAndInfos() {
         WebViewProviderInfo[] allProviders = mSystemInterface.getWebViewPackages();
+        if (DEBUG) Slog.d(TAG, "getValidWebViewPackagesAndInfos: allProviders.length=" + allProviders.length);
         List<ProviderAndPackageInfo> providers = new ArrayList<>();
         for (int n = 0; n < allProviders.length; n++) {
             try {
                 PackageInfo packageInfo =
                         mSystemInterface.getPackageInfoForProvider(allProviders[n]);
-                if (validityResult(allProviders[n], packageInfo) == VALIDITY_OK) {
+                int validity = validityResult(allProviders[n], packageInfo);
+                if (validity == VALIDITY_OK) {
                     providers.add(new ProviderAndPackageInfo(allProviders[n], packageInfo));
+                } else {
+                    Slog.e(TAG, "WebView provider failed validityResult: name=" + packageInfo.packageName + " cause= " + getInvalidityReason(validity));
                 }
             } catch (NameNotFoundException e) {
                 // Don't add non-existent packages
@@ -412,8 +418,10 @@ private ProviderAndPackageInfo[] getValidWebViewPackagesAndInfos() {
      */
     private PackageInfo findPreferredWebViewPackage() throws WebViewPackageMissingException {
         ProviderAndPackageInfo[] providers = getValidWebViewPackagesAndInfos();
+        if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: providers.length=" + providers.length);
 
         String userChosenProvider = mSystemInterface.getUserChosenWebViewProvider(mContext);
+        if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: userChosenProvider=" + userChosenProvider);
 
         // If the user has chosen provider, use that (if it's installed and enabled for all
         // users).
@@ -429,18 +437,26 @@ private PackageInfo findPreferredWebViewPackage() throws WebViewPackageMissingEx
             }
         }
 
+        if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: userChosenProvider did not pan out");
+
         // User did not choose, or the choice failed; use the most stable provider that is
         // installed and enabled for all users, and available by default (not through
         // user choice).
         for (ProviderAndPackageInfo providerAndPackage : providers) {
+            if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: providerAndPackage.packageInfo.packageName=" + providerAndPackage.packageInfo.packageName);
             if (providerAndPackage.provider.availableByDefault) {
                 // userPackages can contain null objects.
                 List<UserPackage> userPackages =
                         mSystemInterface.getPackageInfoForProviderAllUsers(mContext,
                                 providerAndPackage.provider);
+                if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: userPackages=" + userPackages);
                 if (isInstalledAndEnabledForAllUsers(userPackages)) {
                     return providerAndPackage.packageInfo;
+                } else {
+                    if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: isInstalledAndEnabledForAllUsers=false");
                 }
+            } else {
+                if (DEBUG) Slog.d(TAG, "findPreferredWebViewPackage: not available by default providerAndPackage.packageInfo.packageName=" + providerAndPackage.packageInfo.packageName);
             }
         }