commit d0ccd485e2bb22fea4d9d758906dcee7468b4a6a Author: Matthew Finkel <Matthew.Finkel@gmail.com> Date: Mon Jul 16 22:22:59 2018 +0000 Bug 24796 - Comment out excess permissions from GeckoView The GeckoView AndroidManifest.xml is not preprocessed unlike Fennec's manifest, so we can't use the ifdef preprocessor guards around the permissions we do not want. Commenting the permissions is the next-best-thing. --- .../android/geckoview/src/main/AndroidManifest.xml | 31 ++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml index 9a74f5843240..6f82aa6aa74d 100644 --- a/mobile/android/geckoview/src/main/AndroidManifest.xml +++ b/mobile/android/geckoview/src/main/AndroidManifest.xml @@ -1,13 +1,15 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.geckoview"> -#ifdef MOZ_ANDROID_NETWORK_STATE +<!--#ifdef MOZ_ANDROID_NETWORK_STATE--> + <!-- <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> -#endif + --> +<!--#endif--> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> @@ -17,24 +19,25 @@ <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.VIBRATE"/> -#ifdef MOZ_ANDROID_LOCATION +<!--#ifdef MOZ_ANDROID_LOCATION--> + <!-- <uses-feature android:name="android.hardware.location" android:required="false"/> <uses-feature android:name="android.hardware.location.gps" android:required="false"/> -#endif + --> +<!--#endif--> <uses-feature android:name="android.hardware.touchscreen"/> - <uses-permission android:name="android.permission.CAMERA" /> - <uses-feature android:name="android.hardware.camera" android:required="false"/> - <uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/> - - <!--#ifdef MOZ_WEBRTC--> +<!--#ifdef MOZ_WEBRTC--> <!-- TODO preprocess AndroidManifest.xml so that we can conditionally include WebRTC permissions based on MOZ_WEBRTC. --> - <uses-permission android:name="android.permission.RECORD_AUDIO"/>--> - <uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>--> - <uses-feature android:name="android.hardware.microphone" android:required="false"/>--> - <uses-feature android:name="android.hardware.camera.any" android:required="false"/>--> - <!--#endif--> + <!--<uses-permission android:name="android.permission.RECORD_AUDIO"/>--> + <!--<uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>--> + <!--<uses-feature android:name="android.hardware.microphone" android:required="false"/>--> + <!--<uses-feature android:name="android.hardware.camera.any" android:required="false"/>--> + <!--<uses-permission android:name="android.permission.CAMERA" />--> + <!--<uses-feature android:name="android.hardware.camera" android:required="false"/>--> + <!--<uses-feature android:name="android.hardware.camera.autofocus" android:required="false"/>--> +<!--#endif--> <!-- App requires OpenGL ES 2.0 --> <uses-feature android:glEsVersion="0x00020000" android:required="true" />