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:
@@ -45,7 +45,6 @@ import com.android.settings.testutils.CustomActivity;
|
||||
import com.android.settings.testutils.shadow.ShadowActivity;
|
||||
import com.android.settings.testutils.shadow.ShadowDevicePolicyManager;
|
||||
import com.android.settings.testutils.shadow.ShadowUserManager;
|
||||
import com.android.settings.utils.ActivityControllerWrapper;
|
||||
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -78,8 +77,7 @@ public class ActionDisabledByAdminDialogHelperTest {
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
mActivity = (CustomActivity) ActivityControllerWrapper.setup(
|
||||
Robolectric.buildActivity(CustomActivity.class)).get();
|
||||
mActivity = Robolectric.setupActivity(CustomActivity.class);
|
||||
mActivityShadow = Shadow.extract(mActivity);
|
||||
mHelper = new ActionDisabledByAdminDialogHelper(mActivity);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user