[tor-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Move CAMERA permission within MOZ_WEBRTC

[gk at torproject.org]

commit dfb8e56d11dc741a449412697a3bc409588b725b
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Apr 11 18:16:33 2018 +0000

    Bug 25741 - TBA: Move CAMERA permission within MOZ_WEBRTC
    
    Require the CAMERA permissions if MOZ_WEBRTC is defined in
    the preprocessor.
---
 mobile/android/base/FennecManifest_permissions.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mobile/android/base/FennecManifest_permissions.xml.in b/mobile/android/base/FennecManifest_permissions.xml.in
index 25c4b4f215d5..7ca8239cca5a 100644
--- a/mobile/android/base/FennecManifest_permissions.xml.in
+++ b/mobile/android/base/FennecManifest_permissions.xml.in
@@ -53,10 +53,10 @@
     <uses-feature android:name="android.hardware.audio.low_latency" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.any" android:required="false"/>
     <uses-feature android:name="android.hardware.microphone" android:required="false"/>
-#endif
     <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" />