PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix failed test cases" into rvc-dev am: 1676454b3b am: eadd54e1d9

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11970207

Change-Id: I40704bac526083ac5bf5c4fe8255f232e5b842f2
This commit is contained in:
TreeHugger Robot
2020-06-24 06:08:49 +00:00
committed by Automerger Merge Worker
parent 5a439174e6 eadd54e1d9
commit 0b04a19565
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java
View File

@@ -184,6 +184,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
@VisibleForTesting @VisibleForTesting
List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) { List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {
if (candidates.isEmpty()) {
return candidates;
}
final ExecutorService executor = Executors.newFixedThreadPool(candidates.size()); final ExecutorService executor = Executors.newFixedThreadPool(candidates.size());
final List<ContextualCard> cards = new ArrayList<>(); final List<ContextualCard> cards = new ArrayList<>();
List<Future<ContextualCard>> eligibleCards = new ArrayList<>(); List<Future<ContextualCard>> eligibleCards = new ArrayList<>();

10
tests/robotests/src/com/android/settings/slices/SettingsSliceProviderTest.java
View File

@@ -270,23 +270,27 @@ public class SettingsSliceProviderTest {
@Test @Test
public void onBindSlice_nightModeChanged_shouldReloadTheme() { public void onBindSlice_nightModeChanged_shouldReloadTheme() {
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES; mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
final SliceData data = getDummyData(); final SliceData data = getDummyData();
mProvider.mSliceWeakDataCache.put(data.getUri(), data); mProvider.mSliceWeakDataCache.put(data.getUri(), data);
mProvider.onBindSlice(data.getUri()); mProvider.onBindSlice(data.getUri());
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_YES;
mProvider.onBindSlice(data.getUri());
assertThat(ShadowTheme.isThemeRebased()).isTrue(); assertThat(ShadowTheme.isThemeRebased()).isTrue();
} }
@Test @Test
public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() { public void onBindSlice_nightModeNotChanged_shouldNotReloadTheme() {
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO; mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
SliceData data = getDummyData(); SliceData data = getDummyData();
mProvider.mSliceWeakDataCache.put(data.getUri(), data); mProvider.mSliceWeakDataCache.put(data.getUri(), data);
mProvider.onBindSlice(data.getUri()); mProvider.onBindSlice(data.getUri());
mContext.getResources().getConfiguration().uiMode = UI_MODE_NIGHT_NO;
mProvider.onBindSlice(data.getUri());
assertThat(ShadowTheme.isThemeRebased()).isFalse(); assertThat(ShadowTheme.isThemeRebased()).isFalse();
} }