Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f595d96 authored by Yi-Ling Chuang's avatar Yi-Ling Chuang
Browse files

Increase timeout of contextual card pre-check. 

- Also add logs for the binding time of each card.

Bug: 123043695
Test: robotest
Change-Id: Iba666f60bccb27658e43af992ce80be98e5ff7ea
parent 2a736c6e

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

+6 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
    @VisibleForTesting

    static final int DEFAULT_CARD_COUNT = 4;

    static final int CARD_CONTENT_LOADER_ID = 1;

    static final long CARD_CONTENT_LOADER_TIMEOUT_MS = DateUtils.SECOND_IN_MILLIS;

    static final long CARD_CONTENT_LOADER_TIMEOUT_MS = DateUtils.SECOND_IN_MILLIS * 3;



    private static final String TAG = "ContextualCardLoader";
@@ -170,6 +170,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 


    @VisibleForTesting

    boolean isCardEligibleToDisplay(ContextualCard card) {

        final long startTime = System.currentTimeMillis();

        if (card.isCustomCard()) {

            return true;

        }
@@ -190,6 +191,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard> 
        provider.release();



        final Slice slice = Slice.bindSlice(mContext, uri, SUPPORTED_SPECS);

        //TODO(b/123668403): remove the log here once we do the change with FutureTask

        final long bindTime = System.currentTimeMillis() - startTime;

        Log.d(TAG, "Binding time for " + uri + " = " + bindTime);



        if (slice == null || slice.hasHint(HINT_ERROR)) {

            Log.w(TAG, "Failed to bind slice, not eligible for display " + uri);

            return false;

src/com/android/settings/homepage/contextualcards/ContextualCardManager.java

+2 −0
Original line number Diff line number Diff line
@@ -188,6 +188,8 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo 
    @Override

    public void onFinishCardLoading(List<ContextualCard> cards) {

        final long loadTime = System.currentTimeMillis() - mStartTime;

        //TODO(b/123668403): remove the log here once we do the change with FutureTask

        Log.d(TAG, "Total loading time = " + loadTime);

        final List<ContextualCard> cardsToKeep = getCardsToKeep(cards);



        //navigate back to the homepage or after card dismissal