[tbb-commits] [tor-browser] 03/66: Bug 24796: Comment out excess permissions from GeckoView

[gitolite role]

This is an automated email from the git hooks/post-receive script.

richard pushed a commit to branch tor-browser-102.2.0esr-12.0-2
in repository tor-browser.

commit b0a7a07050dc8aff2795b266366ad51776ea7b81
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
AuthorDate: Wed Apr 11 17:52: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.
---
 mobile/android/geckoview/src/main/AndroidManifest.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/mobile/android/geckoview/src/main/AndroidManifest.xml b/mobile/android/geckoview/src/main/AndroidManifest.xml
index f849cee7b89f4..55088a1263037 100644
--- a/mobile/android/geckoview/src/main/AndroidManifest.xml
+++ b/mobile/android/geckoview/src/main/AndroidManifest.xml
@@ -6,20 +6,32 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="org.mozilla.geckoview">
 
+<!--#ifdef MOZ_ANDROID_NETWORK_STATE-->
+    <!--
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    -->
+<!--#endif-->
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
 
+<!--#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-->
     <uses-feature
             android:name="android.hardware.touchscreen"
             android:required="false"/>
+<!--#ifdef MOZ_WEBRTC-->
+    <!-- TODO preprocess AndroidManifest.xml so that we can
+         conditionally include WebRTC permissions based on MOZ_WEBRTC. -->
+    <!--
     <uses-feature
             android:name="android.hardware.camera"
             android:required="false"/>
@@ -36,6 +48,8 @@
     <uses-feature
             android:name="android.hardware.camera.any"
             android:required="false"/>
+    -->
+<!--#endif-->
 
     <!-- GeckoView requires OpenGL ES 2.0 -->
     <uses-feature

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.