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

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.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
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 0678a0f89bd3a2aa1d8c12f395de2e7c7c7d867c..a3e338a7df3db0e47693a38f75680a47556c0d6c 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
@@ -18,6 +18,8 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import javax.annotation.Nullable;
+
/**
* Android wrapper of the TemplateUrlService which provides access from the Java
* layer.
@@ -250,9 +252,10 @@ public class TemplateUrlService {
}
/**
- * @return {@link TemplateUrlService.TemplateUrl} for the default search engine.
+ * @return {@link TemplateUrlService.TemplateUrl} for the default search engine. This can
+ * be null if DSEs are disabled entirely by administrators.
*/
- public TemplateUrl getDefaultSearchEngineTemplateUrl() {
+ public @Nullable TemplateUrl getDefaultSearchEngineTemplateUrl() {
if (!isLoaded()) return null;
int defaultSearchEngineIndex = getDefaultSearchEngineIndex();
@@ -271,8 +274,12 @@ public class TemplateUrlService {
mNativeTemplateUrlServiceAndroid, selectedKeyword);
}
- public boolean isSearchProviderManaged() {
- return nativeIsSearchProviderManaged(mNativeTemplateUrlServiceAndroid);
+ /**
+ * @return Whether the default search engine is managed and controlled by policy. If true, the
+ * DSE can not be modified by the user.
+ */
+ public boolean isDefaultSearchManaged() {
+ return nativeIsDefaultSearchManaged(mNativeTemplateUrlServiceAndroid);
}
/**
@@ -431,7 +438,7 @@ public class TemplateUrlService {
private native void nativeSetUserSelectedDefaultSearchProvider(
long nativeTemplateUrlServiceAndroid, String selectedKeyword);
private native int nativeGetDefaultSearchProviderIndex(long nativeTemplateUrlServiceAndroid);
- private native boolean nativeIsSearchProviderManaged(long nativeTemplateUrlServiceAndroid);
+ private native boolean nativeIsDefaultSearchManaged(long nativeTemplateUrlServiceAndroid);
private native boolean nativeIsSearchResultsPageFromDefaultSearchProvider(
long nativeTemplateUrlServiceAndroid, String url);
private native boolean nativeIsSearchByImageAvailable(long nativeTemplateUrlServiceAndroid);

Powered by Google App Engine
This is Rietveld 408576698