Revert "Test Fix SettingRobolectricTest Fail"

This reverts commit 818f77cd1f.

Reason for revert: Underlying issue fixed in ag/23454315.

Bug: b/275023433
Test: atest SettingsGlobalRoboTests

Change-Id: I1af272efd00b3c5bd35310512f5712d5d1c7d834
This commit is contained in:
Eric Rahm
2023-07-13 12:05:20 +00:00
parent 7cd9300c1d
commit 802b922593
142 changed files with 130 additions and 523 deletions

View File

@@ -53,7 +53,6 @@ import com.android.settings.testutils.shadow.ShadowContentResolver;
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.testutils.shadow.ShadowUserManager;
import com.android.settings.utils.ActivityControllerWrapper;
import com.android.settings.widget.RestrictedButton;
import com.android.settingslib.widget.LayoutPreference;
@@ -113,8 +112,8 @@ public class RemoveAccountPreferenceControllerTest {
when(mAccountManager.getAuthenticatorTypesAsUser(anyInt()))
.thenReturn(new AuthenticatorDescription[0]);
when(mAccountManager.getAccountsAsUser(anyInt())).thenReturn(new Account[0]);
mController = new RemoveAccountPreferenceController((Context) ActivityControllerWrapper
.setup(Robolectric.buildActivity(Activity.class)).get(), mFragment);
mController = new RemoveAccountPreferenceController(
Robolectric.setupActivity(Activity.class), mFragment);
}
@After