Prepare tests for impending robolectric merge

Setting's ShadowUserManager.reset() was unnecessary and collided with a
newly introduced reset() method in its super class. It has been removed.

Test: make -j56 RunSettingsGoogleRoboTests &&
  make -j56 RunSettingsRoboTests &&
  make -j56 RunSettingsLibRoboTests

Change-Id: I63c50eca0de3581fd4f64f4862233446f5937d0c
This commit is contained in:
James Lemieux
2018-11-19 16:48:58 -08:00
parent bd088c4205
commit 1fc96ea98d
13 changed files with 1 additions and 54 deletions

View File

@@ -49,19 +49,6 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
private int[] profileIdsForUser = new int[0];
private boolean mUserSwitchEnabled;
@Resetter
public void reset() {
mUserInfos.clear();
mRestrictions.clear();
mUserProfileInfos.clear();
mRestrictionSources.clear();
mManagedProfiles.clear();
mIsQuietModeEnabled = false;
mUserSwitchEnabled = false;
profileIdsForUser = new int[0];
}
public void setUserInfo(int userHandle, UserInfo userInfo) {
mUserInfos.put(userHandle, userInfo);
}
@@ -90,7 +77,7 @@ public class ShadowUserManager extends org.robolectric.shadows.ShadowUserManager
}
@Implementation
public List<UserHandle> getUserProfiles(){
public List<UserHandle> getUserProfiles() {
int[] userIds = getProfileIds(UserHandle.myUserId(), true /* enabledOnly */);
List<UserHandle> result = new ArrayList<>(userIds.length);
for (int userId : userIds) {