Merge "Move the Robolectric shadow config up." into oc-mr1-dev am: efcc8be05c

am: 5f97c05f1c

Change-Id: I46c4a921a25ef17197e90038ff71a982a192aae7

tests/robotests/src/com/android/settings/SecuritySettingsTest.java

@@ -56,7 +56,11 @@ import org.robolectric.util.ReflectionHelpers;
 import java.util.List;
 
 @RunWith(SettingsRobolectricTestRunner.class)
-@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+@Config(
+    manifest = TestConfig.MANIFEST_PATH,
+    sdk = TestConfig.SDK_VERSION,
+    shadows = {ShadowLockPatternUtils.class}
+)
 public class SecuritySettingsTest {
 
 
@@ -165,9 +169,6 @@ public class SecuritySettingsTest {
     }
 
     @Test
-    @Config (shadows = {
-            ShadowLockPatternUtils.class,
-    })
     public void testNonIndexableKeys_existInXmlLayout() {
         final Context context = spy(RuntimeEnvironment.application);
         UserManager manager = mock(UserManager.class);