Snap for 6157842 from fd7ccd4325d4215fa74d1dd593a69555475025d8 to rvc-release
Change-Id: Id8e85b40cf586779f74c128c76257ee1967ea4cb
diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
index c7a726d..9efdfaa 100644
--- a/tests/src/com/android/providers/contacts/CallLogProviderTest.java
+++ b/tests/src/com/android/providers/contacts/CallLogProviderTest.java
@@ -17,7 +17,6 @@
package com.android.providers.contacts;
import android.telecom.CallerInfo;
-import com.android.internal.telephony.PhoneConstants;
import com.android.providers.contacts.testutil.CommonDatabaseUtils;
import android.content.ComponentName;
diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java
index cf7a113..804e79a 100644
--- a/tests/src/com/android/providers/contacts/ContactsActor.java
+++ b/tests/src/com/android/providers/contacts/ContactsActor.java
@@ -96,6 +96,8 @@
public static final String PACKAGE_GREEN = "com.example.green";
public static final String PACKAGE_BLUE = "org.example.blue";
+ private static final int DEFAULT_USER_ID = 0;
+
public Context context;
public String packageName;
public MockContentResolver resolver;
@@ -170,7 +172,7 @@
public static final UserInfo SECONDARY_USER = createUserInfo("2nd", 11, 11, 0);
/** "My" user. Set it to change the current user. */
- public int myUser = 0;
+ public int myUser = DEFAULT_USER_ID;
private ArrayList<UserInfo> mUsers = new ArrayList<>();
@@ -396,7 +398,11 @@
@Override
public int getUserId() {
- return mockUserManager.getUserHandle();
+ if (mockUserManager != null) {
+ return mockUserManager.getUserHandle();
+ } else {
+ return DEFAULT_USER_ID;
+ }
}
@Override