diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:17:03 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:17:03 -0700 |
| commit | 646ebffe4b25488492dd49b9a5a5a9c3a4c05436 (patch) | |
| tree | 9f3ca8b30cf4217071d58f09e01a037b15f7d55f | |
| parent | 59deedc9c468ce8ae0f10e9c30742fd6f3ac82b7 (diff) | |
| parent | 5ff209f02f753d28c25f3d1ece9495982615526e (diff) | |
| download | pdk-646ebffe4b25488492dd49b9a5a5a9c3a4c05436.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I9e2ef3615569878064119bc776e069fde6905ecb
Change-Id: Ia938e70f256d6d9b9c80f056cb473c8803257e27
| -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" |