Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1618)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java

Issue 115323006: [Android] Fix crash on opening context menu without default search engine. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
index 6b9a736d5731b4561ded9b3a685540d2591e1199..f12c987e137beea0c2129a89153f31c03154162a 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java
@@ -29,6 +29,9 @@ public class TemplateUrlService {
public abstract void onTemplateUrlServiceLoaded();
}
+ /**
+ * Represents search engine with its index.
+ */
public static class TemplateUrl {
private final int mIndex;
private final String mShortName;
@@ -130,7 +133,11 @@ public class TemplateUrlService {
if (!isLoaded()) return null;
int defaultSearchEngineIndex = getDefaultSearchEngineIndex();
+ if (defaultSearchEngineIndex == -1) return null;
+
assert defaultSearchEngineIndex >= 0;
+ assert defaultSearchEngineIndex < nativeGetTemplateUrlCount(
+ mNativeTemplateUrlServiceAndroid);
return nativeGetPrepopulatedTemplateUrlAt(
mNativeTemplateUrlServiceAndroid, defaultSearchEngineIndex);
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698