Remove camera permission in Oculus Go and Quest builds (#1348)

* Remove camera permission in Oculus Go and Quest builds * Remove camera from privacy for oculus * Prevent request for system camera permission
MozillaReality · Jun 28, 2019 · b646db9 · b646db9
1 parent 3171325
commit b646db9
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/PrivacyOptionsView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/PrivacyOptionsView.java
@@ -8,10 +8,12 @@
 import android.Manifest;
 import android.content.Context;
 import android.util.Pair;
+import android.view.View;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
 import org.mozilla.geckoview.GeckoSession;
+import org.mozilla.vrbrowser.BuildConfig;
 import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.audio.AudioEngine;
 import org.mozilla.vrbrowser.browser.SessionStore;
@@ -89,6 +91,9 @@ private void initialize(Context aContext) {
         mPermissionButtons.add(Pair.create(findViewById(R.id.locationPermissionButton), Manifest.permission.ACCESS_FINE_LOCATION));
         mPermissionButtons.add(Pair.create(findViewById(R.id.storagePermissionButton), Manifest.permission.READ_EXTERNAL_STORAGE));
 
+        if (BuildConfig.FLAVOR_platform == "oculusvr3dof" || BuildConfig.FLAVOR_platform == "oculusvr")
+            findViewById(R.id.cameraPermissionButton).setVisibility(View.GONE);
+
         for (Pair<ButtonSetting, String> button: mPermissionButtons) {
             if (mWidgetManager.isPermissionGranted(button.second)) {
                 button.first.setShowAsLabel(true);

diff --git a/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java
@@ -6,18 +6,19 @@
 package org.mozilla.vrbrowser;
 
 import android.app.NativeActivity;
+import android.Manifest;
 import android.os.Bundle;
 import android.util.Log;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 
 public class PlatformActivity extends NativeActivity {
     static String LOGTAG = "VRB";
 
     public static boolean filterPermission(final String aPermission) {
+        if (aPermission.equals(Manifest.permission.CAMERA)) {
+            return true;
+        }
         return false;
     }
 

diff --git a/app/src/oculusvrArmDebug/AndroidManifest.xml b/app/src/oculusvrArmDebug/AndroidManifest.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.vrbrowser">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.vrbrowser" xmlns:tools="http://schemas.android.com/tools">
     <uses-feature android:glEsVersion="0x00030001"/>
     <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="${headtrackingRequired}" />
+    <uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>
     <application>
         <meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
         <activity android:name=".VRBrowserActivity" android:screenOrientation="landscape">

diff --git a/app/src/oculusvrArmRelease/AndroidManifest.xml b/app/src/oculusvrArmRelease/AndroidManifest.xml
@@ -5,6 +5,7 @@
     android:installLocation="auto">
     <uses-feature android:glEsVersion="0x00030001"/>
     <uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="${headtrackingRequired}" />
+    <uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>
     <application
         android:name=".VRBrowserApplication"
         android:allowBackup="true"