bug 918378 - restrict WiFi permissions to nightly and aurora r=mfinkle a=akeybl MOBILE250b1_2013091714_RELBRANCH FENNEC_25_0b1_BUILD2 FENNEC_25_0b1_RELEASE
authorBrad Lassey <blassey@mozilla.com>
Thu, 19 Sep 2013 13:11:30 -0400
branchMOBILE250b1_2013091714_RELBRANCH
changeset 154073 e398a376ceead06bffa5b2fcf349da0b1e88c08a
parent 154062 acabf9f0d5bde15915f9860a4ba5d3304a76f05d
child 154074 a9d943ed17ddfde054a5c95b9a29ea1d7fef4ee7
push id2867
push userblassey@mozilla.com
push dateThu, 19 Sep 2013 18:31:05 +0000
treeherdermozilla-beta@e398a376ceea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle, akeybl
bugs918378
milestone25.0
bug 918378 - restrict WiFi permissions to nightly and aurora r=mfinkle a=akeybl
mobile/android/base/AndroidManifest.xml.in
--- a/mobile/android/base/AndroidManifest.xml.in
+++ b/mobile/android/base/AndroidManifest.xml.in
@@ -11,18 +11,20 @@
       >
     <uses-sdk android:minSdkVersion="8"
               android:targetSdkVersion="16"/>
 
 #include ../services/manifests/AnnouncementsAndroidManifest_permissions.xml.in
 #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"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
     <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
     <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS"/>