Catch TransactionTooLargeException in another case.

chrome/android/java/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandler.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.externalnav;
 
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.ResolveInfo;
@@ skipping 115 matching lines @@
                 && (params.getRedirectHandler() == null
                         // For instance, if this is a chained fallback URL, we ignore it.
                         || !params.getRedirectHandler().shouldNotOverrideUrlLoading())) {
             return clobberCurrentTabWithFallbackUrl(browserFallbackUrl, params);
         }
         return result;
     }
 
     private boolean resolversSubsetOf(List<ResolveInfo> infos, List<ResolveInfo> container) {
         HashSet<ComponentName> containerSet = new HashSet<>();
+        if (container == null) return false;

[Maria, 2016/10/10 22:56:56]

I would move this check above the hash set allocation

[Ted C, 2016/10/10 23:05:45]

Done.

+
         for (ResolveInfo info : container) {
             containerSet.add(
                     new ComponentName(info.activityInfo.packageName, info.activityInfo.name));
         }
         for (ResolveInfo info : infos) {
             if (!containerSet.contains(new ComponentName(
                     info.activityInfo.packageName, info.activityInfo.name))) {
                 return false;
             }
         }
@@ skipping 156 matching lines @@
         // security (only access to BROWSABLE activities).
         intent.addCategory(Intent.CATEGORY_BROWSABLE);
         intent.setComponent(null);
         Intent selector = intent.getSelector();
         if (selector != null) {
             selector.addCategory(Intent.CATEGORY_BROWSABLE);
             selector.setComponent(null);
         }
 
         List<ResolveInfo> resolvingInfos = mDelegate.queryIntentActivities(intent);
+        if (resolvingInfos == null) return OverrideUrlLoadingResult.NO_OVERRIDE;
+
         boolean canResolveActivity = resolvingInfos.size() > 0;
         // check whether the intent can be resolved. If not, we will see
         // whether we can download it from the Market.
         if (!canResolveActivity) {
             if (hasBrowserFallbackUrl) {
                 return clobberCurrentTabWithFallbackUrl(browserFallbackUrl, params);
             }
 
             String packagename = intent.getPackage();
             if (packagename != null) {
@@ skipping 104 matching lines @@
                     Intent previousIntent;
                     try {
                         previousIntent = Intent.parseUri(
                                 params.getReferrerUrl(), Intent.URI_INTENT_SCHEME);
                     } catch (Exception e) {
                         previousIntent = null;
                     }
 
                     if (previousIntent != null
                             && resolversSubsetOf(resolvingInfos,
-                                       mDelegate.queryIntentActivities(previousIntent))) {
+                                    mDelegate.queryIntentActivities(previousIntent))) {
                         return OverrideUrlLoadingResult.NO_OVERRIDE;
                     }
                 }
             }
         }
 
         boolean shouldProxyForInstantApps = isExternalProtocol
                 && SUPERVISOR_PKG.equals(intent.getPackage())
                 && mDelegate.isSerpReferrer(params.getReferrerUrl(), params.getTab());
 
@@ skipping 88 matching lines @@
                 browserFallbackUrl, params.getReferrerUrl(), params.getTab());
     }
 
     /**
      * @return Whether the |url| could be handled by an external application on the system.
      */
     public boolean canExternalAppHandleUrl(String url) {
         if (url.startsWith(SCHEME_WTAI_MC)) return true;
         try {
             Intent intent = Intent.parseUri(url, Intent.URI_INTENT_SCHEME);
-            return intent.getPackage() != null
-                    || mDelegate.queryIntentActivities(intent).size() > 0;
+            if (intent.getPackage() != null) return true;
+
+            List<ResolveInfo> resolvingInfos = mDelegate.queryIntentActivities(intent);
+            if (resolvingInfos != null && resolvingInfos.size() > 0) return true;
         } catch (Exception ex) {
             // Ignore the error.
             Log.w(TAG, "Bad URI %s", url, ex);
         }
         return false;
     }
 
     /**
      * Dispatch SMS intents to the default SMS application if applicable.
      * Most SMS apps refuse to send SMS if not set as default SMS application.
      *
      * @param resolvingComponentNames The list of ComponentName that resolves the current intent.
      */
     private String getDefaultSmsPackageName(List<ResolveInfo> resolvingComponentNames) {
         String defaultSmsPackageName = mDelegate.getDefaultSmsPackageName();
         if (defaultSmsPackageName == null) return null;
         // Makes sure that the default SMS app actually resolves the intent.
         for (ResolveInfo resolveInfo : resolvingComponentNames) {
             if (defaultSmsPackageName.equals(resolveInfo.activityInfo.packageName)) {
                 return defaultSmsPackageName;
             }
         }
         return null;
     }
 }