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

Commit ad2c02de authored by Gautam Shende's avatar Gautam Shende Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19571325



Change-Id: I569ccf1cc273d44451afd660d514f56f4f88979c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2403a9d1 cdcefab3

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

+4 −0
Original line number Diff line number Diff line
@@ -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.

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

+2 −1
Original line number Diff line number Diff line
@@ -886,7 +886,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) {