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

Merge "Fix homepage cards show up problem after first launch" into rvc-dev am: 64dbdebfbf am: 7ebe511104

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

Change-Id: Ib6f924bc21c9199c05a2374753ad6b8391d2eec9
This commit is contained in:
Jason Chiu
2020-06-22 06:44:57 +00:00
committed by Automerger Merge Worker
parent 953e87a578 7ebe511104
commit 2e67b3f645
1 changed files with 27 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,14 +38,14 @@ import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUt
import com.android.settings.overlay.FeatureFactory; import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.utils.AsyncLoaderCompat; import com.android.settingslib.utils.AsyncLoaderCompat;
import com.android.settingslib.utils.ThreadUtils;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException; import java.util.stream.Collectors;
public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> { public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
@@ -56,7 +56,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
static final int CARD_CONTENT_LOADER_ID = 1; static final int CARD_CONTENT_LOADER_ID = 1;
private static final String TAG = "ContextualCardLoader"; private static final String TAG = "ContextualCardLoader";
private static final long ELIGIBILITY_CHECKER_TIMEOUT_MS = 300; private static final long ELIGIBILITY_CHECKER_TIMEOUT_MS = 400;
private final ContentObserver mObserver = new ContentObserver( private final ContentObserver mObserver = new ContentObserver(
new Handler(Looper.getMainLooper())) { new Handler(Looper.getMainLooper())) {
@@ -184,23 +184,37 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>
@VisibleForTesting @VisibleForTesting
List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) { List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {
final ExecutorService executor = Executors.newFixedThreadPool(candidates.size());
final List<ContextualCard> cards = new ArrayList<>(); final List<ContextualCard> cards = new ArrayList<>();
final List<Future<ContextualCard>> eligibleCards = new ArrayList<>(); List<Future<ContextualCard>> eligibleCards = new ArrayList<>();
for (ContextualCard card : candidates) { final List<EligibleCardChecker> checkers = candidates.stream()
final EligibleCardChecker checker = new EligibleCardChecker(mContext, card); .map(card -> new EligibleCardChecker(mContext, card))
eligibleCards.add(ThreadUtils.postOnBackgroundThread(checker)); .collect(Collectors.toList());
}
// Collect future and eligible cards
for (Future<ContextualCard> cardFuture : eligibleCards) {
try { try {
final ContextualCard card = cardFuture.get(ELIGIBILITY_CHECKER_TIMEOUT_MS, eligibleCards = executor.invokeAll(checkers, ELIGIBILITY_CHECKER_TIMEOUT_MS,
TimeUnit.MILLISECONDS); TimeUnit.MILLISECONDS);
} catch (InterruptedException e) {
Log.w(TAG, "Failed to get eligible states for all cards", e);
}
executor.shutdown();
// Collect future and eligible cards
for (int i = 0; i < eligibleCards.size(); i++) {
final Future<ContextualCard> cardFuture = eligibleCards.get(i);
if (cardFuture.isCancelled()) {
Log.w(TAG, "Timeout getting eligible state for card: "
+ candidates.get(i).getSliceUri());
continue;
}
try {
final ContextualCard card = cardFuture.get();
if (card != null) { if (card != null) {
cards.add(card); cards.add(card);
} }
} catch (ExecutionException | InterruptedException | TimeoutException e) { } catch (Exception e) {
Log.w(TAG, "Failed to get eligible state for card: " + e.toString()); Log.w(TAG, "Failed to get eligible state for card", e);
} }
} }
return cards; return cards;