LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update account visibility test apps to handle O SDK level." into oc-dev

Browse Source
This commit is contained in:
Dmitry Dementyev
2017-05-31 20:18:02 +00:00
committed by Android (Google) Code Review
parent fbbce47234 ad67c43908
commit 47e13c9735
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/PushApiAuthenticator/AndroidManifest.xml
View File

@@ -17,8 +17,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.pushapiauthenticator"> package="com.example.android.pushapiauthenticator">
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS"/>
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<!-- Uses API introduced in O (26) -->
<uses-sdk android:minSdkVersion="1"
android:targetSdkVersion="26"/>
<application android:label="Auth Tester" android:icon="@drawable/push"> <application android:label="Auth Tester" android:icon="@drawable/push">
<activity android:name="MainActivity"> <activity android:name="MainActivity">
<intent-filter> <intent-filter>

8
apps/PushApiTestAppOne/AndroidManifest.xml
View File

@@ -17,11 +17,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.pushapithirdpartyone"> package="com.example.android.pushapithirdpartyone">
<uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS"/>
<!-- Should target O API level(26) or above to test GET_ACCOUNTS account visibility logic -->
<uses-sdk android:minSdkVersion="1" <uses-sdk android:minSdkVersion="1"
android:targetSdkVersion="10001" android:targetSdkVersion="26"/>
android:maxSdkVersion="11000" />
<application android:label="3P App 1" android:icon="@drawable/push"> <application android:label="3P App 1" android:icon="@drawable/push">
<activity android:name="MainActivity"> <activity android:name="MainActivity">
<intent-filter> <intent-filter>

6
apps/PushApiTestAppTwo/AndroidManifest.xml
View File

@@ -18,10 +18,10 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.pushapithirdpartytwo"> package="com.example.android.pushapithirdpartytwo">
<uses-permission android:name="android.permission.GET_ACCOUNTS"/> <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
<uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.READ_CONTACTS"/>
<!-- Should target pre O API level -->
<uses-sdk android:minSdkVersion="1" <uses-sdk android:minSdkVersion="1"
android:targetSdkVersion="1001" android:targetSdkVersion="25"/>
android:maxSdkVersion="11000" />
<application android:label="3P App 2" android:icon="@drawable/push"> <application android:label="3P App 2" android:icon="@drawable/push">
<activity android:name="MainActivity"> <activity android:name="MainActivity">
<intent-filter> <intent-filter>