Commit 92b7f247 authored by Matthew Finkel's avatar Matthew Finkel Committed by Matthew Finkel
Browse files

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.
parent d6f37f46
......@@ -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"/>
......@@ -28,14 +40,16 @@
android:required="false"/>
<uses-feature
android:name="android.hardware.audio.low_latency"
android:name="android.hardware.camera.any"
android:required="false"/>
<uses-feature
android:name="android.hardware.microphone"
android:name="android.hardware.audio.low_latency"
android:required="false"/>
<uses-feature
android:name="android.hardware.camera.any"
android:name="android.hardware.microphone"
android:required="false"/>
-->
<!--#endif-->
<!-- GeckoView requires OpenGL ES 2.0 -->
<uses-feature
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment