diff options
| author | Dmitry Dementyev <dementyev@google.com> | 2017-05-19 16:06:15 -0700 |
|---|---|---|
| committer | Dmitry Dementyev <dementyev@google.com> | 2017-05-22 14:38:36 -0700 |
| commit | ad67c43908e36f0c3161219d9161baf4f476534d (patch) | |
| tree | 25ec13e51a59515baadcaa2b10698f299bae424e /apps | |
| parent | f2e4985ba0cea72addab729c03ef1e374cf66b47 (diff) | |
| download | android_development-ad67c43908e36f0c3161219d9161baf4f476534d.tar.gz android_development-ad67c43908e36f0c3161219d9161baf4f476534d.tar.bz2 android_development-ad67c43908e36f0c3161219d9161baf4f476534d.zip | |
Update account visibility test apps to handle O SDK level.
Bug: 38462043, 38462390
Test: manual
Change-Id: Ib388e65af2adac216e9b8218ebecb7ccbf676224
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/PushApiAuthenticator/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | apps/PushApiTestAppOne/AndroidManifest.xml | 8 | ||||
| -rw-r--r-- | apps/PushApiTestAppTwo/AndroidManifest.xml | 6 |
3 files changed, 12 insertions, 9 deletions
diff --git a/apps/PushApiAuthenticator/AndroidManifest.xml b/apps/PushApiAuthenticator/AndroidManifest.xml index dd602c76f..2b641d1ce 100644 --- a/apps/PushApiAuthenticator/AndroidManifest.xml +++ b/apps/PushApiAuthenticator/AndroidManifest.xml @@ -17,8 +17,11 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.pushapiauthenticator"> - <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" /> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + <uses-permission android:name="android.permission.AUTHENTICATE_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"> <activity android:name="MainActivity"> <intent-filter> diff --git a/apps/PushApiTestAppOne/AndroidManifest.xml b/apps/PushApiTestAppOne/AndroidManifest.xml index 46a03732d..619ebd2c2 100644 --- a/apps/PushApiTestAppOne/AndroidManifest.xml +++ b/apps/PushApiTestAppOne/AndroidManifest.xml @@ -17,11 +17,11 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.pushapithirdpartyone"> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> - <uses-permission android:name="android.permission.READ_CONTACTS" /> + <uses-permission android:name="android.permission.GET_ACCOUNTS"/> + <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" - android:targetSdkVersion="10001" - android:maxSdkVersion="11000" /> + android:targetSdkVersion="26"/> <application android:label="3P App 1" android:icon="@drawable/push"> <activity android:name="MainActivity"> <intent-filter> diff --git a/apps/PushApiTestAppTwo/AndroidManifest.xml b/apps/PushApiTestAppTwo/AndroidManifest.xml index b2bcbed15..07ac20a42 100644 --- a/apps/PushApiTestAppTwo/AndroidManifest.xml +++ b/apps/PushApiTestAppTwo/AndroidManifest.xml @@ -18,10 +18,10 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.example.android.pushapithirdpartytwo"> <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" - android:targetSdkVersion="1001" - android:maxSdkVersion="11000" /> + android:targetSdkVersion="25"/> <application android:label="3P App 2" android:icon="@drawable/push"> <activity android:name="MainActivity"> <intent-filter> |