aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinhui Wang <jinhuiw@google.com>2016-07-07 15:44:17 -0700
committerJinhui Wang <jinhuiw@google.com>2016-07-07 15:44:17 -0700
commit86a6b698a3d338e48e039bfb0292eef78b1e375e (patch)
tree015762e1af6692e626472d837571626f38d29fbb
parent6e99e953346bb5db7feb691bc199dd942dc3b839 (diff)
downloadAfwTestHarness-86a6b698a3d338e48e039bfb0292eef78b1e375e.tar.gz
Add android:targetSdkVersion to manifests
Change-Id: I7562f439df32c869bf9bf2b6ce54c816369a8f6d
-rw-r--r--apps/DeviceAdmin/AndroidManifest.xml8
-rw-r--r--apps/SystemUtil/AndroidManifest.xml5
-rw-r--r--tests/NfcProvisioning/AndroidManifest.xml2
-rw-r--r--tests/NonSuwPoProvisioning/AndroidManifest.xml2
-rw-r--r--tests/SuwDoProvisioning/AndroidManifest.xml2
-rw-r--r--tests/SuwPoProvisioning/AndroidManifest.xml2
6 files changed, 12 insertions, 9 deletions
diff --git a/apps/DeviceAdmin/AndroidManifest.xml b/apps/DeviceAdmin/AndroidManifest.xml
index aca9832..990cf22 100644
--- a/apps/DeviceAdmin/AndroidManifest.xml
+++ b/apps/DeviceAdmin/AndroidManifest.xml
@@ -17,12 +17,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.afwtest.deviceadmin" >
- <uses-sdk android:minSdkVersion="22"/>
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23"/>
<application>
<receiver
android:name=".AdminReceiver"
- android:permission="android.permission.BIND_DEVICE_ADMIN">
+ android:permission="android.permission.BIND_DEVICE_ADMIN"
+ android:exported="true">
<meta-data android:name="android.app.device_admin"
android:resource="@xml/device_admin" />
<intent-filter>
@@ -32,7 +33,8 @@
<activity
android:name="com.android.afwtest.deviceadmin.FactoryResetActivity"
- android:label="Factory Reset" >
+ android:label="Factory Reset"
+ android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
diff --git a/apps/SystemUtil/AndroidManifest.xml b/apps/SystemUtil/AndroidManifest.xml
index 0d0436b..bfbbb00 100644
--- a/apps/SystemUtil/AndroidManifest.xml
+++ b/apps/SystemUtil/AndroidManifest.xml
@@ -18,7 +18,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.afwtest.systemutil" >
- <uses-sdk android:minSdkVersion="22" />
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
<uses-permission android:name="android.permission.DISPATCH_NFC_MESSAGE" />
@@ -41,7 +41,8 @@
<!-- NFC Bump Sender activity -->
<activity
android:name="com.android.afwtest.systemutil.NfcBumpSender"
- android:label="NFC Bump Sender" >
+ android:label="NFC Bump Sender"
+ android:exported="true">
<intent-filter>
<action android:name="com.android.afwtest.systemutil.action.SEND_NFC_BUMP" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/tests/NfcProvisioning/AndroidManifest.xml b/tests/NfcProvisioning/AndroidManifest.xml
index 93c1163..099bd21 100644
--- a/tests/NfcProvisioning/AndroidManifest.xml
+++ b/tests/NfcProvisioning/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.afwtest.nfcprovisioning">
- <uses-sdk android:minSdkVersion="22"/>
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23"/>
<application>
<uses-library android:name="android.test.runner" />
diff --git a/tests/NonSuwPoProvisioning/AndroidManifest.xml b/tests/NonSuwPoProvisioning/AndroidManifest.xml
index 19b8587..7ce4301 100644
--- a/tests/NonSuwPoProvisioning/AndroidManifest.xml
+++ b/tests/NonSuwPoProvisioning/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.afwtest.nonsuwpoprovisioning">
- <uses-sdk android:minSdkVersion="22"/>
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/tests/SuwDoProvisioning/AndroidManifest.xml b/tests/SuwDoProvisioning/AndroidManifest.xml
index 01f5f25..9b3e112 100644
--- a/tests/SuwDoProvisioning/AndroidManifest.xml
+++ b/tests/SuwDoProvisioning/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.afwtest.suwdoprovisioning">
- <uses-sdk android:minSdkVersion="22"/>
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
diff --git a/tests/SuwPoProvisioning/AndroidManifest.xml b/tests/SuwPoProvisioning/AndroidManifest.xml
index 23edc7a..dacb205 100644
--- a/tests/SuwPoProvisioning/AndroidManifest.xml
+++ b/tests/SuwPoProvisioning/AndroidManifest.xml
@@ -17,7 +17,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.afwtest.suwpoprovisioning">
- <uses-sdk android:minSdkVersion="22"/>
+ <uses-sdk android:minSdkVersion="22" android:targetSdkVersion="23"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />