Disable camera permissions on Pico devices (#2830)

* Disable camera permissions on Pico devices * Prevent web pages from requesting camera permission Co-authored-by: Randall E. Barker <simstorm@mac.com>
MozillaReality · Feb 21, 2020 · fc9fd6d · fc9fd6d
1 parent d6952aa
commit fc9fd6d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
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
@@ -90,7 +90,7 @@ protected void updateUI() {
         mPermissionButtons.add(Pair.create(findViewById(R.id.locationPermissionSwitch), Manifest.permission.ACCESS_FINE_LOCATION));
         mPermissionButtons.add(Pair.create(findViewById(R.id.storagePermissionSwitch), Manifest.permission.READ_EXTERNAL_STORAGE));
 
-        if (DeviceType.isOculusBuild() || DeviceType.isWaveBuild()) {
+        if (DeviceType.isOculusBuild() || DeviceType.isWaveBuild() || DeviceType.isPicoVR()) {
             findViewById(R.id.cameraPermissionSwitch).setVisibility(View.GONE);
         }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/utils/DeviceType.java b/app/src/common/shared/org/mozilla/vrbrowser/utils/DeviceType.java
@@ -39,4 +39,8 @@ public static boolean isWaveBuild() {
     public static boolean isGoogleVR() {
         return BuildConfig.FLAVOR_platform.toLowerCase().contains("googlevr");
     }
+
+    public static boolean isPicoVR() {
+        return BuildConfig.FLAVOR_platform.toLowerCase().contains("picovr");
+    }
 }
diff --git a/app/src/picovr/java/org/mozilla/vrbrowser/PlatformActivity.java b/app/src/picovr/java/org/mozilla/vrbrowser/PlatformActivity.java
@@ -5,6 +5,7 @@
 
 package org.mozilla.vrbrowser;
 
+import android.Manifest;
 import android.os.Bundle;
 import android.util.Log;
 
@@ -32,7 +33,11 @@
 
 public class PlatformActivity extends VRActivity implements RenderInterface, CVControllerListener {
     static String LOGTAG = SystemUtils.createLogtag(PlatformActivity.class);
+
     public static boolean filterPermission(final String aPermission) {
+        if (aPermission.equals(Manifest.permission.CAMERA)) {
+            return true;
+        }
         return false;
     }