diff options
| author | Marcus Hagerott <mhagerott@google.com> | 2016-10-06 08:50:01 -0700 |
|---|---|---|
| committer | Marcus Hagerott <mhagerott@google.com> | 2016-10-06 08:58:21 -0700 |
| commit | 03a8bb0405fa28711c0d0053c7b316130708e80f (patch) | |
| tree | b0fea04c9bd599ff5b697bfd5568b5f69efdd1db | |
| parent | b435077e8717dce6ffe3bfec9d220651fe2936a2 (diff) | |
| download | Contacts-03a8bb0405fa28711c0d0053c7b316130708e80f.tar.gz | |
Fix test failure due to missing proguard rule.
Test
Ran failing test on userdebug build:
$ adb shell am instrument -e class \
com.android.contacts.NoPermissionsLaunchSmokeTest -w \
com.google.android.contacts.tests/android.support.test.runner.AndroidJUnitRunner
Change-Id: Ib699d24767ed87ecc9c0d3954f08c35f2542d1e6
| -rw-r--r-- | proguard.flags | 1 | ||||
| -rw-r--r-- | tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/proguard.flags b/proguard.flags index 80809a906..052f79cc7 100644 --- a/proguard.flags +++ b/proguard.flags @@ -73,6 +73,7 @@ -keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory { *; } -keep class com.android.contacts.common.util.DeviceLocalAccountTypeFactory$* { *; } -keep class com.android.contacts.common.util.NameConverter { *; } +-keep class com.android.contacts.common.util.PermissionsUtil { *; } -keep class com.android.contacts.common.util.SearchUtil { *; } -keep class com.android.contacts.common.util.SearchUtil$* { *; } -keep class com.android.contacts.ContactsApplication { *; } diff --git a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java index a196ffaa2..8364b7b07 100644 --- a/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java +++ b/tests/src/com/android/contacts/NoPermissionsLaunchSmokeTest.java @@ -3,6 +3,7 @@ package com.android.contacts; import android.Manifest; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.support.test.InstrumentationRegistry; import android.support.test.filters.MediumTest; import android.support.test.runner.AndroidJUnit4; @@ -75,6 +76,12 @@ public class NoPermissionsLaunchSmokeTest { 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; + } + final UiObject2 grantPhonePermissionButton = device.findObject(By.text("ALLOW")); grantPhonePermissionButton.clickAndWait(Until.newWindow(), TIMEOUT); |