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 9cabbd2dd..d5b13af2b 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 @@ -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 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 index 4d0181181..ad1730626 100644 --- a/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java +++ b/app/src/oculusvr/java/org/mozilla/vrbrowser/PlatformActivity.java @@ -6,11 +6,9 @@ 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; @@ -18,6 +16,9 @@ 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 index 3dbe4ccf7..0ec479c3f 100644 --- a/app/src/oculusvrArmDebug/AndroidManifest.xml +++ b/app/src/oculusvrArmDebug/AndroidManifest.xml @@ -1,7 +1,8 @@ - + + diff --git a/app/src/oculusvrArmRelease/AndroidManifest.xml b/app/src/oculusvrArmRelease/AndroidManifest.xml index aaeaf307e..e8f8788ca 100644 --- a/app/src/oculusvrArmRelease/AndroidManifest.xml +++ b/app/src/oculusvrArmRelease/AndroidManifest.xml @@ -5,6 +5,7 @@ android:installLocation="auto"> +