commit fd882624f95a494d63de90d38cafce6e8408320f
author Fan Wu <cechkahn@google.com> Fri Mar 22 04:13:29 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 22 04:13:29 2024 +0000
tree 8c0a0934ef9e8c0aca212df6e0f62faa511faff8
parent e4bfb2d2b576251890dff67ee146d602f306fecd
parent e2b861dce0b2bee39734d0728a90910e51cf9cee

Merge "Re-enable failed test in FactoryResetPreferenceControllerTest" into main

tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
index 01d0df9..0dede09 100644
--- a/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
@@ -46,7 +46,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -107,7 +106,6 @@
                 Settings.Global.DEVICE_DEMO_MODE, 0);
     }
 
-    @Ignore("b/314930928")
     @Test
     public void isAvailable_systemUser() {
         when(mUserManager.isAdminUser()).thenReturn(true);