diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2020-02-25 12:28:02 -0800 |
|---|---|---|
| committer | Eino-Ville Talvala <etalvala@google.com> | 2020-02-26 17:27:54 +0000 |
| commit | 25245b54da4ffd53e4ece0c384a89da270e50418 (patch) | |
| tree | 9f3ca8b30cf4217071d58f09e01a037b15f7d55f | |
| parent | f68ea29f44cbe595d16f19825db2e353ff927818 (diff) | |
| download | pdk-25245b54da4ffd53e4ece0c384a89da270e50418.tar.gz | |
TestingCamera1/2: Minor bandaids to keep storage workingandroid-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100
Target API level 28 for now to ensure saving to sdcard continues to work.
Bug: 150294644
Test: Both apps can save to sdcard instead of crashing/erroring
Change-Id: I083b34b60b9dd481d2332e54fb172a1b4865c178
| -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" |