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

Commit b646db9

Browse files
authored
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
1 parent 3171325 commit b646db9

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

‎app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/PrivacyOptionsView.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
import android.Manifest;
99
import android.content.Context;
1010
import android.util.Pair;
11+
import android.view.View;
1112
import android.widget.ScrollView;
1213
import android.widget.TextView;
1314

1415
import org.mozilla.geckoview.GeckoSession;
16+
import org.mozilla.vrbrowser.BuildConfig;
1517
import org.mozilla.vrbrowser.R;
1618
import org.mozilla.vrbrowser.audio.AudioEngine;
1719
import org.mozilla.vrbrowser.browser.SessionStore;
@@ -89,6 +91,9 @@ private void initialize(Context aContext) {
8991
mPermissionButtons.add(Pair.create(findViewById(R.id.locationPermissionButton), Manifest.permission.ACCESS_FINE_LOCATION));
9092
mPermissionButtons.add(Pair.create(findViewById(R.id.storagePermissionButton), Manifest.permission.READ_EXTERNAL_STORAGE));
9193

94+
if (BuildConfig.FLAVOR_platform == "oculusvr3dof" || BuildConfig.FLAVOR_platform == "oculusvr")
95+
findViewById(R.id.cameraPermissionButton).setVisibility(View.GONE);
96+
9297
for (Pair<ButtonSetting, String> button: mPermissionButtons) {
9398
if (mWidgetManager.isPermissionGranted(button.second)) {
9499
button.first.setShowAsLabel(true);

‎app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,19 @@
66
package org.mozilla.vrbrowser;
77

88
import android.app.NativeActivity;
9+
import android.Manifest;
910
import android.os.Bundle;
1011
import android.util.Log;
11-
import android.view.InputDevice;
12-
import android.view.KeyEvent;
13-
import android.view.MotionEvent;
1412
import android.view.View;
1513
import android.view.WindowManager;
1614

1715
public class PlatformActivity extends NativeActivity {
1816
static String LOGTAG = "VRB";
1917

2018
public static boolean filterPermission(final String aPermission) {
19+
if (aPermission.equals(Manifest.permission.CAMERA)) {
20+
return true;
21+
}
2122
return false;
2223
}
2324

‎app/src/oculusvrArmDebug/AndroidManifest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.vrbrowser">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mozilla.vrbrowser" xmlns:tools="http://schemas.android.com/tools">
33
<uses-feature android:glEsVersion="0x00030001"/>
44
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="${headtrackingRequired}" />
5+
<uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>
56
<application>
67
<meta-data android:name="com.samsung.android.vr.application.mode" android:value="vr_only"/>
78
<activity android:name=".VRBrowserActivity" android:screenOrientation="landscape">

‎app/src/oculusvrArmRelease/AndroidManifest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
android:installLocation="auto">
66
<uses-feature android:glEsVersion="0x00030001"/>
77
<uses-feature android:name="android.hardware.vr.headtracking" android:version="1" android:required="${headtrackingRequired}" />
8+
<uses-permission android:name="android.permission.CAMERA" tools:node="remove"/>
89
<application
910
android:name=".VRBrowserApplication"
1011
android:allowBackup="true"

0 commit comments

Comments
 (0)