[tbb-commits] [tor-browser/tor-browser-68.1.0esr-9.0-2] Bug 31720: Enable website suggestions in address bar

[gk at torproject.org]

commit 683863bc344137462c60c6ae001d1333df41297d
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Sep 18 18:32:24 2019 +0000

    Bug 31720: Enable website suggestions in address bar
---
 mobile/android/base/java/org/mozilla/gecko/BrowserApp.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
index f03548e30ced..5d6f725dc1c5 100644
--- a/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
+++ b/mobile/android/base/java/org/mozilla/gecko/BrowserApp.java
@@ -1452,7 +1452,9 @@ public class BrowserApp extends GeckoApp
         // Website suggestions for address bar inputs should not be enabled when running in automation.
         // After the upgrade to support library v.26 it could fail otherwise unrelated Robocop tests
         // See https://bugzilla.mozilla.org/show_bug.cgi?id=1385464#c3
-        if (!isInAutomation) {
+        // But only disable it when this isn't Tor Browser, because isInAutomation is overloaded such
+        // that it is |true| in Tor Browser.
+        if (!isInAutomation || AppConstants.isTorBrowser()) {
             mBrowserToolbar.setOnFilterListener(new BrowserToolbar.OnFilterListener() {
                 @Override
                 public void onFilter(String searchText, AutocompleteHandler handler) {