aboutsummaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorTrevor Johns <trevorjohns@google.com>2015-08-19 14:33:32 -0700
committerTrevor Johns <trevorjohns@google.com>2015-08-19 14:33:32 -0700
commitdee2a470f22da43c3f37b26207213f3707cb8bbe (patch)
tree8e218ed8bb28ac583aeaef727dc7ada052a331b9 /media
parentd8babe3c9f1d45807065b736215fca279932f891 (diff)
downloadandroid-dee2a470f22da43c3f37b26207213f3707cb8bbe.tar.gz
Peg permissions-based samples at API 22
Per go/android-pending-samples, these samples may use permissions that are incompatible with M's Runtime Permissions without additional modifications. Temporarily holding them back at Target SDK 22 until these changes are made. Change-Id: Icc86b0ac168c0dd6f96a4ee76b32691da9c0995a
Diffstat (limited to 'media')
-rw-r--r--media/Camera2Basic/template-params.xml2
-rw-r--r--media/Camera2Raw/template-params.xml2
-rw-r--r--media/Camera2Video/template-params.xml2
-rw-r--r--media/MediaRecorder/template-params.xml1
4 files changed, 4 insertions, 3 deletions
diff --git a/media/Camera2Basic/template-params.xml b/media/Camera2Basic/template-params.xml
index b4afe4c4..09e4986b 100644
--- a/media/Camera2Basic/template-params.xml
+++ b/media/Camera2Basic/template-params.xml
@@ -22,7 +22,7 @@
<group>Media</group>
<package>com.example.android.camera2basic</package>
<minSdk>21</minSdk>
- <compileSdkVersion>21</compileSdkVersion>
+ <compileSdkVersion>22</compileSdkVersion>
<strings>
<intro>
<![CDATA[
diff --git a/media/Camera2Raw/template-params.xml b/media/Camera2Raw/template-params.xml
index 3d735e8e..c44de7d2 100644
--- a/media/Camera2Raw/template-params.xml
+++ b/media/Camera2Raw/template-params.xml
@@ -20,7 +20,7 @@
<group>Media</group>
<package>com.example.android.camera2raw</package>
<minSdk>21</minSdk>
- <compileSdkVersion>21</compileSdkVersion>
+ <compileSdkVersion>22</compileSdkVersion>
<strings>
<intro>
<![CDATA[
diff --git a/media/Camera2Video/template-params.xml b/media/Camera2Video/template-params.xml
index 320f3acd..d981b18f 100644
--- a/media/Camera2Video/template-params.xml
+++ b/media/Camera2Video/template-params.xml
@@ -21,7 +21,7 @@
<package>com.example.android.camera2video</package>
<minSdk>21</minSdk>
- <compileSdkVersion>21</compileSdkVersion>
+ <compileSdkVersion>22</compileSdkVersion>
<strings>
<intro>
diff --git a/media/MediaRecorder/template-params.xml b/media/MediaRecorder/template-params.xml
index a057637e..bf1fbcea 100644
--- a/media/MediaRecorder/template-params.xml
+++ b/media/MediaRecorder/template-params.xml
@@ -19,6 +19,7 @@
<group>Media</group>
<package>com.example.android.mediarecorder</package>
<minSdk>16</minSdk>
+ <compileSdkVersion>22</compileSdkVersion>
<strings>
<intro>
<![CDATA[