aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBookatz <bookatz@google.com>2019-11-21 17:50:52 -0800
committerBookatz <bookatz@google.com>2019-11-21 17:50:52 -0800
commit73742bb28c80d18583343852b8e5d9ea2c7e12f7 (patch)
tree1e51c303f6655a0a40b00dec64ea9d459e182dc7
parent97d726ee0baeb8a35d9d30b056d9a18c75120aa5 (diff)
downloadContactsProvider-73742bb28c80d18583343852b8e5d9ea2c7e12f7.tar.gz
Don't use UserInfo() ContactsProvider test
UserInfo now has a mandatory userType field. This test suite was creating a UserInfo via the no-argument constructor, and therefore wasn't setting a userType. We therefore use a different constructor that sets the userType (based on the flags). Fixes: 144948105 Fixes: 144948002 Fixes: 144948940 Fixes: 144948801 Fixes: 144948802 Test: atest ContactsProviderTests:com.android.providers.contacts.ContactsProvider2Test Test: atest com.android.providers.contacts.util.UserUtilsTest Change-Id: I0fde2b2303a0d1b2a1d40bfe37480df6eeca61af
-rw-r--r--tests/src/com/android/providers/contacts/ContactsActor.java5
1 files changed, 1 insertions, 4 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java
index 89f296be..cf7a1136 100644
--- a/tests/src/com/android/providers/contacts/ContactsActor.java
+++ b/tests/src/com/android/providers/contacts/ContactsActor.java
@@ -158,11 +158,8 @@ public class ContactsActor {
public static class MockUserManager extends UserManager {
public static UserInfo createUserInfo(String name, int id, int groupId, int flags) {
- final UserInfo ui = new UserInfo();
- ui.name = name;
- ui.id = id;
+ final UserInfo ui = new UserInfo(id, name, flags | UserInfo.FLAG_INITIALIZED);
ui.profileGroupId = groupId;
- ui.flags = flags | UserInfo.FLAG_INITIALIZED;
return ui;
}