diff options
| author | Gyanesh Mittal <gyaneshm@google.com> | 2023-06-09 00:53:51 +0000 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-06-09 00:53:51 +0000 |
| commit | 3dc8535eba6584727f47a11beb0da715e2bde95f (patch) | |
| tree | eeb94a03719f81b30eb1d5619ad080120555f425 /tests | |
| parent | c32739b44f1c58c05bf0cb87d3e23a9c4f338d0c (diff) | |
| download | Contacts-3dc8535eba6584727f47a11beb0da715e2bde95f.tar.gz | |
Add READ_CALL_LOG permission to AOSP Contacts app
Bug: 286070452
Test: Manually
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:762d495956e50363c51b428232f672a836547635)
Merged-In: I47cb4a96ed688c678bef1aa31b251c6956e81920
Change-Id: I47cb4a96ed688c678bef1aa31b251c6956e81920
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java | 11 |
2 files changed, 10 insertions, 2 deletions
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml index f22f92c5a..9ccfa3f89 100644 --- a/tests/AndroidManifest.xml +++ b/tests/AndroidManifest.xml @@ -20,6 +20,7 @@ <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> + <uses-permission android:name="android.permission.READ_CALL_LOG"/> <uses-permission android:name="android.permission.WRITE_CONTACTS" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java index ba9a5b754..59f81478d 100644 --- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java +++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java @@ -54,6 +54,7 @@ public class NoPermissionsLaunchSmokeTest { assumeTrue(!hasPermission(mTargetContext, Manifest.permission.GET_ACCOUNTS)); assumeTrue(!hasPermission(mTargetContext, Manifest.permission.READ_PHONE_STATE)); assumeTrue(!hasPermission(mTargetContext, Manifest.permission.CALL_PHONE)); + assumeTrue(!hasPermission(mTargetContext, Manifest.permission.READ_CALL_LOG)); // remove state that might exist outside of the app // (e.g. launcher shortcuts and scheduled jobs) @@ -72,14 +73,20 @@ public class NoPermissionsLaunchSmokeTest { device.waitForIdle(); - device.wait(Until.hasObject(By.textStartsWith("Allow Contacts")), TIMEOUT); + final PackageManager packageManager = mTargetContext.getPackageManager(); + if (packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { + device.wait(Until.hasObject(By.textEndsWith("your phone call logs?")), TIMEOUT); + final UiObject2 grantCallLogPermissionButton = device.findObject(By.text("ALLOW")); + grantCallLogPermissionButton.click(); + } + + device.wait(Until.hasObject(By.textEndsWith("access your contacts?")), TIMEOUT); final UiObject2 grantContactsPermissionButton = device.findObject(By.text("ALLOW")); grantContactsPermissionButton.click(); device.wait(Until.hasObject(By.textEndsWith("make and manage phone calls?")), TIMEOUT); - final PackageManager packageManager = mTargetContext.getPackageManager(); if (!packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) { device.waitForIdle(); return; |