commit a73b09bd8df85c93f1c95356efc1c41c103b11cc
author Yorke Lee <yorkelee@google.com> Wed Jul 16 17:50:45 2014 -0700
committer Yorke Lee <yorkelee@google.com> Wed Jul 16 18:08:40 2014 -0700
tree 085cc72560a1a97ccd0b7812d04e7bedecae2dc5
parent d841fcb6aeb9fe7cb9454668bf641782f88f4382

Fix broken tests in CP2

Change-Id: I1c198cbf086c7f267178a26d2a50123a8edaec12

src/com/android/providers/contacts/util/UserUtils.java

diff --git a/src/com/android/providers/contacts/util/UserUtils.java b/src/com/android/providers/contacts/util/UserUtils.java
index e593d73..bff81a2 100644
--- a/src/com/android/providers/contacts/util/UserUtils.java
+++ b/src/com/android/providers/contacts/util/UserUtils.java
@@ -44,6 +44,11 @@
      */
     public static int getCorpUserId(Context context) {
         final UserManager um = getUserManager(context);
+        if (um == null) {
+            Log.w(TAG, "No user manager service found");
+            return -1;
+        }
+
         final int myUser = um.getUserHandle();
 
         // STOPSHIP Check the policy and make sure cross-user contacts lookup is allowed. b/16301261

tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java

diff --git a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
index 78b9ec5..867f01f 100644
--- a/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
+++ b/tests/src/com/android/providers/contacts/CallerInfoIntegrationTest.java
@@ -54,7 +54,7 @@
         assertEquals("Hot Tamale", callerInfo.name);
         assertEquals("ring", String.valueOf(callerInfo.contactRingtoneUri));
         assertEquals(true, callerInfo.shouldSendToVoicemail);
-        assertEquals("content://com.android.contacts/phone_lookup/18004664411",
+        assertEquals("content://com.android.contacts/phone_lookup_enterprise/18004664411",
                 String.valueOf(callerInfo.contactRefUri));
     }
 }