From e83c8a5534bc841d42fb5a702fdf979bbd9d4ac5 Mon Sep 17 00:00:00 2001 From: Guilherme Goncalves Date: Fri, 11 Apr 2014 13:33:00 +0200 Subject: [PATCH] Bug 995407 - Re-enable wifi/cell tower data reporting on release builds. r=blassey First attempt at this. I'm not totally sure how to make sure this is working, though: the best information I could find on making a release build was [1], and yet changing milestone.txt manually didn't seem to work. On the bright side, this does look consistent with the patch on bug 909938. 1- https://wiki.mozilla.org/Platform/Channel-specific_build_defines --- mobile/android/base/AndroidManifest.xml.in | 2 -- mobile/android/base/preferences/GeckoPreferences.java | 5 ----- mobile/android/confvars.sh | 4 +--- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/mobile/android/base/AndroidManifest.xml.in b/mobile/android/base/AndroidManifest.xml.in index 5b5adf88bd6f..43669820013b 100644 --- a/mobile/android/base/AndroidManifest.xml.in +++ b/mobile/android/base/AndroidManifest.xml.in @@ -17,10 +17,8 @@ #include ../services/manifests/HealthReportAndroidManifest_permissions.xml.in #include ../services/manifests/SyncAndroidManifest_permissions.xml.in -#ifndef RELEASE_BUILD -#endif diff --git a/mobile/android/base/preferences/GeckoPreferences.java b/mobile/android/base/preferences/GeckoPreferences.java index 7aa31392ee7f..4acdf9fbe9ea 100644 --- a/mobile/android/base/preferences/GeckoPreferences.java +++ b/mobile/android/base/preferences/GeckoPreferences.java @@ -385,11 +385,6 @@ public class GeckoPreferences preferences.removePreference(pref); i--; continue; - } else if (AppConstants.RELEASE_BUILD && PREFS_GEO_REPORTING.equals(key)) { - // We don't build wifi/cell tower collection in release builds, so hide the UI. - preferences.removePreference(pref); - i--; - continue; } else if (PREFS_DEVTOOLS_REMOTE_ENABLED.equals(key)) { final Context thisContext = this; pref.setOnPreferenceClickListener(new OnPreferenceClickListener() { diff --git a/mobile/android/confvars.sh b/mobile/android/confvars.sh index 86f617918107..8961952bb5d1 100644 --- a/mobile/android/confvars.sh +++ b/mobile/android/confvars.sh @@ -61,10 +61,8 @@ MOZ_SERVICES_HEALTHREPORT=1 # Enable FirefoxAccounts MOZ_SERVICES_FXACCOUNTS=1 -# Wifi-AP/cell tower data reporting is enabled on non-release builds. -if test ! "$RELEASE_BUILD"; then +# Enable Wifi-AP/cell tower data reporting MOZ_DATA_REPORTING=1 -fi # Enable the production cert for verifying signed packaged apps. MOZ_B2G_CERTDATA=1