diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-24 04:05:47 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-01-24 04:05:47 +0000 |
| commit | 7b6aa636196e924842e4c926a250eb4067411b70 (patch) | |
| tree | 452cd0859cc2b38503939892c70bfbba900d76d3 | |
| parent | a9cbebe05eaa4f876b8a8e75ce76de39e185b0a6 (diff) | |
| parent | fd7ccd4325d4215fa74d1dd593a69555475025d8 (diff) | |
| download | ContactsProvider-7b6aa636196e924842e4c926a250eb4067411b70.tar.gz | |
Snap for 6157842 from fd7ccd4325d4215fa74d1dd593a69555475025d8 to rvc-release
Change-Id: Id8e85b40cf586779f74c128c76257ee1967ea4cb
| -rw-r--r-- | tests/src/com/android/providers/contacts/CallLogProviderTest.java | 1 | ||||
| -rw-r--r-- | tests/src/com/android/providers/contacts/ContactsActor.java | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/tests/src/com/android/providers/contacts/CallLogProviderTest.java b/tests/src/com/android/providers/contacts/CallLogProviderTest.java index c7a726dd..9efdfaa4 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 cf7a1136..804e79a9 100644 --- a/tests/src/com/android/providers/contacts/ContactsActor.java +++ b/tests/src/com/android/providers/contacts/ContactsActor.java @@ -96,6 +96,8 @@ public class ContactsActor { 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 class ContactsActor { 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 @@ public class ContactsActor { @Override public int getUserId() { - return mockUserManager.getUserHandle(); + if (mockUserManager != null) { + return mockUserManager.getUserHandle(); + } else { + return DEFAULT_USER_ID; + } } @Override |