Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-15 14:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 995407 - Re-enable wifi/cell tower data reporting on release builds. r=blassey

Browse Source 
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
This commit is contained in:
Guilherme Goncalves 2014-04-11 13:33:00 +02:00
parent 004496ffc0
commit e83c8a5534
3 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/AndroidManifest.xml.in
View File

@ -17,10 +17,8 @@
#include ../services/manifests/HealthReportAndroidManifest_permissions.xml.in
#include ../services/manifests/SyncAndroidManifest_permissions.xml.in
#ifndef RELEASE_BUILD
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
#endif
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET"/>

5
mobile/android/base/preferences/GeckoPreferences.java
View File

@ -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() {

4
mobile/android/confvars.sh
View File

@ -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