From 1f595d9659aaacf982b8a568a5c24a790a7d51b8 Mon Sep 17 00:00:00 2001 From: Yi-Ling Chuang Date: Thu, 31 Jan 2019 13:23:28 +0800 Subject: [PATCH] Increase timeout of contextual card pre-check. - Also add logs for the binding time of each card. Bug: 123043695 Test: robotest Change-Id: Iba666f60bccb27658e43af992ce80be98e5ff7ea --- .../homepage/contextualcards/ContextualCardLoader.java | 7 ++++++- .../homepage/contextualcards/ContextualCardManager.java | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java index 88c489b4d7f..674756a380d 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java @@ -51,7 +51,7 @@ public class ContextualCardLoader extends AsyncLoaderCompat @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 @VisibleForTesting boolean isCardEligibleToDisplay(ContextualCard card) { + final long startTime = System.currentTimeMillis(); if (card.isCustomCard()) { return true; } @@ -190,6 +191,10 @@ public class ContextualCardLoader extends AsyncLoaderCompat 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; diff --git a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java index b35a38a0862..344c248def9 100644 --- a/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java +++ b/src/com/android/settings/homepage/contextualcards/ContextualCardManager.java @@ -188,6 +188,8 @@ public class ContextualCardManager implements ContextualCardLoader.CardContentLo @Override public void onFinishCardLoading(List 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 cardsToKeep = getCardsToKeep(cards); //navigate back to the homepage or after card dismissal