aboutsummaryrefslogtreecommitdiff
path: root/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
diff options
context:
space:
mode:
Diffstat (limited to 'apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java')
-rw-r--r--apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java12
1 files changed, 4 insertions, 8 deletions
diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java b/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
index ddf0098..01ba6b6 100644
--- a/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
+++ b/apps/TestingCamera2/src/com/android/testingcamera2/CameraOps2.java
@@ -109,18 +109,14 @@ public class CameraOps2 extends CameraManager.AvailabilityCallback {
return false;
}
}
- if ((mActivity.checkSelfPermission(Manifest.permission.CAMERA)
- != PackageManager.PERMISSION_GRANTED)
- || (mActivity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
- != PackageManager.PERMISSION_GRANTED)) {
- TLog.i("Requesting camera/storage permissions");
+ if (mActivity.checkSelfPermission(Manifest.permission.CAMERA)
+ != PackageManager.PERMISSION_GRANTED) {
+ TLog.i("Requesting camera permissions");
mDelayedOpenId = cameraId;
mDelayedOpenListener = listener;
- mActivity.requestPermissions(new String[] {
- Manifest.permission.CAMERA,
- Manifest.permission.WRITE_EXTERNAL_STORAGE },
+ mActivity.requestPermissions(new String[] {Manifest.permission.CAMERA},
PERMISSIONS_REQUEST_CAMERA);
return false;
}