diff options
| author | Emilian Peev <epeev@google.com> | 2019-03-06 16:28:37 -0800 |
|---|---|---|
| committer | Emilian Peev <epeev@google.com> | 2019-03-06 16:36:04 -0800 |
| commit | c75d21245e5a89e667286fc6da62b04f290c264c (patch) | |
| tree | 93b3c387646e9f69044d0f2ed874154719261080 /apps | |
| parent | e667698383bb4f33d4e85ba3d5a4f95324a97720 (diff) | |
| download | pdk-c75d21245e5a89e667286fc6da62b04f290c264c.tar.gz | |
TestingCamera2: Remove external storage permission
The application should default to the sandboxed
storage "/sdcard/Android/sandbox/com.android.testingcamera2".
Bug: 124384600
Test: Manual using application
Change-Id: I02014b0dc042772f00f8ba147d0451a8d7e34d1d
Diffstat (limited to 'apps')
3 files changed, 5 insertions, 14 deletions
diff --git a/apps/TestingCamera2/AndroidManifest.xml b/apps/TestingCamera2/AndroidManifest.xml index 79c1b7f..430d8ba 100644 --- a/apps/TestingCamera2/AndroidManifest.xml +++ b/apps/TestingCamera2/AndroidManifest.xml @@ -37,8 +37,6 @@ android:required="false" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> - <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <application android:icon="@mipmap/launcher_testingcamera2" 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; } diff --git a/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java b/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java index c5e9ae5..27273a8 100644 --- a/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java +++ b/apps/TestingCamera2/src/com/android/testingcamera2/v1/TestingCamera2.java @@ -237,14 +237,11 @@ public class TestingCamera2 extends Activity implements SurfaceHolder.Callback { if ((checkSelfPermission(Manifest.permission.CAMERA) != PackageManager.PERMISSION_GRANTED ) || (checkSelfPermission(Manifest.permission.RECORD_AUDIO) - != PackageManager.PERMISSION_GRANTED) - || (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED)) { Log.i(TAG, "Requested camera/video permissions"); requestPermissions(new String[] { Manifest.permission.CAMERA, - Manifest.permission.RECORD_AUDIO, - Manifest.permission.WRITE_EXTERNAL_STORAGE}, + Manifest.permission.RECORD_AUDIO }, PERMISSIONS_REQUEST_CAMERA); return; } |