From e132000043706b59e91994bf4b47e11d59456039 Mon Sep 17 00:00:00 2001 From: Garvan Keeley Date: Thu, 18 Sep 2014 12:53:00 -0400 Subject: [PATCH] Bug 1068388 - Part 5: If stumbler built off, test should ignore stumbler prefs. r=nalexander --- mobile/android/base/tests/testSettingsMenuItems.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/mobile/android/base/tests/testSettingsMenuItems.java b/mobile/android/base/tests/testSettingsMenuItems.java index f83e1e67085..27b8dd9be82 100644 --- a/mobile/android/base/tests/testSettingsMenuItems.java +++ b/mobile/android/base/tests/testSettingsMenuItems.java @@ -170,12 +170,14 @@ public class testSettingsMenuItems extends PixelTest { 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