From 387bffcd46cf69516ff91b41c9e77dadee045d87 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Fri, 1 Dec 2017 10:14:24 -0800 Subject: [PATCH] fix DatabaseIndexingManagerTest hanging in tests Test: make RunSettingsRoboTests -j40 Change-Id: I755c04daadcb8804d97f72521d84573d80b4ff19 --- src/com/android/settings/search/IndexDatabaseHelper.java | 3 ++- .../android/settings/search/DatabaseIndexingManagerTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java index 19e34194a5a..7073545bf9e 100644 --- a/src/com/android/settings/search/IndexDatabaseHelper.java +++ b/src/com/android/settings/search/IndexDatabaseHelper.java @@ -293,7 +293,8 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper { } static void setBuildIndexed(Context context, String buildNo) { - context.getSharedPreferences(SHARED_PREFS_TAG, 0).edit().putBoolean(buildNo, true).commit(); + // Use #apply() instead of #commit() since #commit() Robolectric loop indefinitely in sdk 26 + context.getSharedPreferences(SHARED_PREFS_TAG, 0).edit().putBoolean(buildNo, true).apply(); } private void dropTables(SQLiteDatabase db) { diff --git a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java index 20f58ad0f7a..7b5f474aedc 100644 --- a/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java +++ b/tests/robotests/src/com/android/settings/search/DatabaseIndexingManagerTest.java @@ -70,7 +70,7 @@ import java.util.Set; @RunWith(SettingsRobolectricTestRunner.class) @Config( manifest = TestConfig.MANIFEST_PATH, - sdk = TestConfig.SDK_VERSION, + sdk = TestConfig.SDK_VERSION_O, shadows = { ShadowRunnableAsyncTask.class, }