diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-26 18:18:39 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-02-26 18:18:39 +0000 |
| commit | 5f3fd2c8a53f532011424ab0a9398bfbdbe064ba (patch) | |
| tree | 9f3ca8b30cf4217071d58f09e01a037b15f7d55f | |
| parent | f68ea29f44cbe595d16f19825db2e353ff927818 (diff) | |
| parent | c1c81570da0ca381cfa90f3620f6c58c8d4c983e (diff) | |
| download | pdk-5f3fd2c8a53f532011424ab0a9398bfbdbe064ba.tar.gz | |
TestingCamera1/2: Minor bandaids to keep storage working am: 25245b54da am: bb95dd1bb9 am: d8b78b279d am: c1c81570da
Change-Id: I403ac8ed1b48aa7845762f3abaf8da6079aa42f8
| -rw-r--r-- | apps/TestingCamera/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | apps/TestingCamera2/Android.mk | 1 | ||||
| -rw-r--r-- | apps/TestingCamera2/AndroidManifest.xml | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/apps/TestingCamera/AndroidManifest.xml b/apps/TestingCamera/AndroidManifest.xml index 415364c..4380358 100644 --- a/apps/TestingCamera/AndroidManifest.xml +++ b/apps/TestingCamera/AndroidManifest.xml @@ -22,7 +22,7 @@ <uses-feature android:name="android.hardware.camera" /> <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" /> - <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="10000"/> + <uses-sdk android:minSdkVersion="17" android:targetSdkVersion="28"/> <uses-feature android:name="android.hardware.camera.front" android:required="false"/> <uses-permission android:name="android.permission.RECORD_AUDIO"/> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> diff --git a/apps/TestingCamera2/Android.mk b/apps/TestingCamera2/Android.mk index 983feae..a9428a4 100644 --- a/apps/TestingCamera2/Android.mk +++ b/apps/TestingCamera2/Android.mk @@ -21,6 +21,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := current +LOCAL_MIN_SDK_VERSION := 19 LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2 diff --git a/apps/TestingCamera2/AndroidManifest.xml b/apps/TestingCamera2/AndroidManifest.xml index 430d8ba..0fab9d3 100644 --- a/apps/TestingCamera2/AndroidManifest.xml +++ b/apps/TestingCamera2/AndroidManifest.xml @@ -30,13 +30,15 @@ <uses-sdk android:minSdkVersion="21" - android:targetSdkVersion="10000" /> + android:targetSdkVersion="28" /> <uses-feature android:name="android.hardware.camera.front" 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" |