From 4eae272a4f036918ced55396a0d9619ffb329251 Mon Sep 17 00:00:00 2001 From: Gautam Shende Date: Tue, 9 Aug 2022 22:41:01 +0000 Subject: [PATCH] Set dimensional logging info to null for media pass. Also adds logging only value to template type enum. Bug: 235615616 Test: Unit-tests. Change-Id: If526ee4233ad3983956c4e156b20a7e4a3c9f9bc changekind: TRIVIAL_REBASE --- core/java/android/app/smartspace/SmartspaceTarget.java | 4 ++++ .../src/com/android/systemui/media/MediaCarouselController.kt | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/java/android/app/smartspace/SmartspaceTarget.java b/core/java/android/app/smartspace/SmartspaceTarget.java index 79d7b216628ff..3c66a15399d3e 100644 --- a/core/java/android/app/smartspace/SmartspaceTarget.java +++ b/core/java/android/app/smartspace/SmartspaceTarget.java @@ -245,6 +245,10 @@ public final class SmartspaceTarget implements Parcelable { public static final int UI_TEMPLATE_COMBINED_CARDS = 6; // Sub-card template whose data is represented by {@link SubCardTemplateData} public static final int UI_TEMPLATE_SUB_CARD = 7; + // Reserved: 8 + // Template type used by non-UI template features for sending logging information in the + // base template data. This should not be used for UI template features. + // public static final int UI_TEMPLATE_LOGGING_ONLY = 8; /** * The types of the Smartspace ui templates. diff --git a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt index f8c6a5791839c..d893cad8e7433 100644 --- a/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt +++ b/packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt @@ -912,7 +912,8 @@ class MediaCarouselController @Inject constructor( interactedSubcardRank, interactedSubcardCardinality, receivedLatencyMillis, - null // Media cards cannot have subcards. + null, // Media cards cannot have subcards. + null // Media cards don't have dimensions today. ) /* ktlint-disable max-line-length */ if (DEBUG) {