Merge "Settings: Re-enable WebViewAppPickerTest#testNotFinishedIfAdmin" into main

2024-11-07 17:13:49 +00:00
parent e7ba339a6e 329fbfed7d
commit a3b4cf4f26
1 changed files with 0 additions and 2 deletions
--- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
+++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java
@@ -48,7 +48,6 @@ import com.android.settingslib.widget.SelectorWithWidgetPreference;

 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -210,7 +209,6 @@ public class WebViewAppPickerTest {
        verify(mActivity, times(1)).finish();
    }

-    @Ignore("b/313615637")
    @Test
    public void testNotFinishedIfAdmin() {
        mUserManager.setIsAdminUser(true);