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

Commit cdcefab3 authored by Gautam Shende's avatar Gautam Shende Committed by Android (Google) Code Review
Browse files

Merge "Set dimensional logging info to null for media pass." into tm-qpr-dev

parents 3713c5e2 4eae272a

core/java/android/app/smartspace/SmartspaceTarget.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -245,6 +245,10 @@ public final class SmartspaceTarget implements Parcelable { 
    public static final int UI_TEMPLATE_COMBINED_CARDS = 6;

    public static final int UI_TEMPLATE_COMBINED_CARDS = 6;

    // Sub-card template whose data is represented by {@link SubCardTemplateData}

    // Sub-card template whose data is represented by {@link SubCardTemplateData}

    public static final int UI_TEMPLATE_SUB_CARD = 7;

    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.

     * The types of the Smartspace ui templates.

packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt

+2 −1
Original line number Original line Diff line number Diff line
@@ -886,7 +886,8 @@ class MediaCarouselController @Inject constructor( 
                    interactedSubcardRank,

                    interactedSubcardRank,

                    interactedSubcardCardinality,

                    interactedSubcardCardinality,

                    receivedLatencyMillis,

                    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 */

            /* ktlint-disable max-line-length */

            if (DEBUG) {

            if (DEBUG) {