From fc9fd6dc64daeb0937b1d08a4add9f4e7474f1ce Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Fri, 21 Feb 2020 21:12:06 +0100 Subject: [PATCH] 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 --- .../vrbrowser/ui/widgets/settings/PrivacyOptionsView.java | 2 +- .../shared/org/mozilla/vrbrowser/utils/DeviceType.java | 4 ++++ .../picovr/java/org/mozilla/vrbrowser/PlatformActivity.java | 5 +++++ 3 files changed, 10 insertions(+), 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 index de39aa264..3fbfef8f8 100644 --- 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 index b4516b095..c988eb533 100644 --- 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 index c54aee79a..96e277bec 100644 --- 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; }