Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Disable camera permissions on Pico devices #2830

Merged
merged 2 commits into from
Feb 21, 2020
Merged

Disable camera permissions on Pico devices #2830

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3170f2a
Disable camera permissions on Pico devices
keianhzo Feb 21, 2020
3c3f6ae
Prevent web pages from requesting camera permission
bluemarvin Feb 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/PrivacyOptionsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 4 additions & 0 deletions app/src/common/shared/org/mozilla/vrbrowser/utils/DeviceType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
5 changes: 5 additions & 0 deletions app/src/picovr/java/org/mozilla/vrbrowser/PlatformActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

package org.mozilla.vrbrowser;

import android.Manifest;
import android.os.Bundle;
import android.util.Log;

Expand Down Expand Up @@ -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;
}

Expand Down