chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java - Issue 2938403002: Check for the default search engine being null before using.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

Issue 2938403002: Check for the default search engine being null before using. (Closed)

Patch Set: Update comments Created 3 years, 6 months 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/search_engines/TemplateUrlService.java ('k') | chrome/browser/search_engines/template_url_service_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

index 427aba5840819352734b35bfd13a12a9256cea78..2e410a1922e38a0cf3abd193595f01ea6a3fac65 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchWidgetProvider.java

@@ -32,6 +32,7 @@ import org.chromium.chrome.browser.locale.LocaleManager;

import org.chromium.chrome.browser.omnibox.LocationBarLayout;

import org.chromium.chrome.browser.search_engines.TemplateUrlService;

import org.chromium.chrome.browser.search_engines.TemplateUrlService.LoadListener;

+import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrl;

import org.chromium.chrome.browser.search_engines.TemplateUrlService.TemplateUrlServiceObserver;

import org.chromium.chrome.browser.util.IntentUtils;

@@ -303,12 +304,17 @@ public class SearchWidgetProvider extends AppWidgetProvider {

if (!service.isLoaded()) return;

// Update the URL that we show for zero-suggest.

- String searchEngineUrl = service.getSearchEngineUrlFromTemplateUrl(

- service.getDefaultSearchEngineTemplateUrl().getKeyword());

- sDefaultSearchEngineUrl =

- LocationBarLayout.splitPathFromUrlDisplayText(searchEngineUrl).first;

+ TemplateUrl dseTemplateUrl = service.getDefaultSearchEngineTemplateUrl();

+ String engineName = null;

+ if (dseTemplateUrl != null) {

+ String searchEngineUrl =

+ service.getSearchEngineUrlFromTemplateUrl(dseTemplateUrl.getKeyword());

+ sDefaultSearchEngineUrl =

+ LocationBarLayout.splitPathFromUrlDisplayText(searchEngineUrl).first;

+ engineName = dseTemplateUrl.getShortName();

+ }

- updateCachedEngineName(service.getDefaultSearchEngineTemplateUrl().getShortName());

+ updateCachedEngineName(engineName);

}

/**