commit 4a62634eaf9e69cbaca900d259330ab5d632f373
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 26 17:53:03 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 26 17:53:03 2020 +0000
tree 9f3ca8b30cf4217071d58f09e01a037b15f7d55f
parent f68ea29f44cbe595d16f19825db2e353ff927818
parent bb95dd1bb9816adeb74391266864c17a1b6fb89e

TestingCamera1/2: Minor bandaids to keep storage working am: 25245b54da am: bb95dd1bb9

Change-Id: If9bec5df02033d299f3d675569b0bd81893e3ced

apps/TestingCamera/AndroidManifest.xml

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"/>

apps/TestingCamera2/Android.mk

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 @@
 LOCAL_MODULE_TAGS := optional
 
 LOCAL_SDK_VERSION := current
+LOCAL_MIN_SDK_VERSION := 19
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2
 

apps/TestingCamera2/AndroidManifest.xml

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"