Bug 1068388 - Part 5: If stumbler built off, test should ignore stumbler prefs. r=nalexander
authorGarvan Keeley <gkeeley@mozilla.com>
Thu, 18 Sep 2014 12:53:00 -0400
changeset 206265 0a4ce94e4658cd937e94ad3f15e3eda25f58eeea
parent 206264 5629a09d7c3fc864bbda1c8b4db7bdf61a733585
child 206266 43bc9236ea468d1b9386970037f4d9ec96878f24
push id27519
push userkwierso@gmail.com
push dateFri, 19 Sep 2014 23:56:39 +0000
treeherdermozilla-central@a85324dfc960 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1068388
milestone35.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1068388 - Part 5: If stumbler built off, test should ignore stumbler prefs. r=nalexander
mobile/android/base/tests/testSettingsMenuItems.java
--- a/mobile/android/base/tests/testSettingsMenuItems.java
+++ b/mobile/android/base/tests/testSettingsMenuItems.java
@@ -165,22 +165,24 @@ public class testSettingsMenuItems exten
                 settingsMap.get(PATH_DISPLAY).add(newTabletUi);
             }
 
             // New tablet UI: we don't allow a page title option.
             if (NewTabletUI.isEnabled(getActivity())) {
                 settingsMap.get(PATH_DISPLAY).remove(TITLE_BAR_LABEL_ARR);
             }
 
-            // Anonymous cell tower/wifi collection - only built if *not* release build
-            String[] networkReportingUi = { "Mozilla Location Service", "Receives Wi-Fi and cellular location data when running in the background and shares it with Mozilla to improve our geolocation service" };
-            settingsMap.get(PATH_MOZILLA).add(networkReportingUi);
+            if (AppConstants.MOZ_STUMBLER_BUILD_TIME_ENABLED) {
+                // Anonymous cell tower/wifi collection
+                String[] networkReportingUi = { "Mozilla Location Service", "Receives Wi-Fi and cellular location data when running in the background and shares it with Mozilla to improve our geolocation service" };
+                settingsMap.get(PATH_MOZILLA).add(networkReportingUi);
 
-            String[] learnMoreUi = { "Learn more" };
-            settingsMap.get(PATH_MOZILLA).add(learnMoreUi);
+                String[] learnMoreUi = { "Learn more" };
+                settingsMap.get(PATH_MOZILLA).add(learnMoreUi);
+            }
         }
 
         // Automatic updates
         if (AppConstants.MOZ_UPDATER) {
             String[] autoUpdateUi = { "Download updates automatically", "Only over Wi-Fi", "Always", "Only over Wi-Fi", "Never" };
             settingsMap.get(PATH_CUSTOMIZE).add(autoUpdateUi);
         }