commit a828442313ae2757b717ec4acb23a21a8e62dc4c
author Raj Mamadgi <rmamadgi@sta.samsung.com> Mon Oct 10 23:05:51 2016 -0700
committer Raj Mamadgi <rmamadgi@sta.samsung.com> Thu Oct 13 11:34:47 2016 -0700
tree a98043a022dc278dde5bcd0e5b9f2120816bc9bd
parent dca43016043d80924c2c23c77170b944c3fafb3e

Fix for  testManagedContactsPolicies

The test is failing becuase we have a preloaded directory
provider. Fixing the CTS to handle this scenario. We are checking
if the test authority is same.

b/32077396

Change-Id: I57f3207dc66d7805c5af51b3ef794f3856263423
Signed-off-by: Raj Mamadgi <rmamadgi@sta.samsung.com>

hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java

diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java
index f0fada4..65adee8 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ContactsTest.java
@@ -82,6 +82,10 @@
     private static final String PRIMARY_DIRECTORY_CONTACT_NAME = "PrimaryDirectoryContact";
     private static final String MANAGED_DIRECTORY_CONTACT_NAME = "ManagedDirectoryContact";
 
+    // Directory Authority
+    private static final String DIRECTORY_PROVIDER_AUTHORITY = "com.android.cts.contact.directory.provider";
+
+
     // Retry directory query so we can make sure directory info in cp2 is updated
     private static final int MAX_RETRY_DIRECTORY_QUERY = 10;
     private static final int RETRY_DIRECTORY_QUERY_INTERVAL = 1000; // 1s
@@ -975,13 +979,15 @@
     private long getRemoteDirectoryIdInternal() {
         final Cursor cursor = mResolver.query(Directory.ENTERPRISE_CONTENT_URI,
                 new String[]{
-                        Directory._ID
+                        Directory._ID, Directory.DIRECTORY_AUTHORITY
                 }, null, null, null);
         try {
             while (cursor.moveToNext()) {
                 final long directoryId = cursor.getLong(0);
+                final String directoryAuthority = cursor.getString(1);
                 if (!Directory.isEnterpriseDirectoryId(directoryId)
-                        && Directory.isRemoteDirectoryId(directoryId)) {
+                        && Directory.isRemoteDirectoryId(directoryId)
+                        && DIRECTORY_PROVIDER_AUTHORITY.equals(directoryAuthority)) {
                     return directoryId;
                 }
             }
@@ -1002,13 +1008,15 @@
         assertFalse(isManagedProfile());
         final Cursor cursor = mResolver.query(Directory.ENTERPRISE_CONTENT_URI,
                 new String[] {
-                    Directory._ID
+                    Directory._ID, Directory.DIRECTORY_AUTHORITY
                 }, null, null, null);
         try {
             while (cursor.moveToNext()) {
                 final long directoryId = cursor.getLong(0);
+                final String directoryAuthority = cursor.getString(1);
                 if (Directory.isEnterpriseDirectoryId(directoryId)
-                        && Directory.isRemoteDirectoryId(directoryId)) {
+                        && Directory.isRemoteDirectoryId(directoryId)
+                        && DIRECTORY_PROVIDER_AUTHORITY.equals(directoryAuthority)) {
                     return directoryId;
                 }
             }