Adopt robolectric 3.6.1

Bug: 71596155 Test: make RunSettingsRoboTests Change-Id: I46362bae1e3ddd3ce19ade1c93250d272f3366e6
2018-01-11 18:07:54 -08:00
parent e9a3a14330
commit 99d10a4e62
8 changed files with 55 additions and 78 deletions
--- a/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
+++ b/tests/robotests/src/com/android/settings/slices/SlicesIndexerTest.java
@@ -79,7 +79,6 @@ public class SlicesIndexerTest {
        String newKey = "newKey";
        String newTitle = "newTitle";
        SlicesDatabaseHelper.getInstance(mContext).setIndexedState();
-        Locale.setDefault(new Locale("ca"));
        insertSpecialCase(newKey, newTitle);

        // Attempt indexing - should not do anything.