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

Commit c6caf1cf authored by Tom Chen's avatar Tom Chen Committed by Android (Google) Code Review
Browse files

Merge "[DO NOT MERGE] T Subcard logging - Media Card code path" into tm-dev

parents 82c131e3 49e76804

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

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ public final class SmartspaceTarget implements Parcelable { 
    public static final int FEATURE_MEDIA_HEADS_UP = 36;

    public static final int FEATURE_STEP_COUNTING = 37;

    public static final int FEATURE_EARTHQUAKE_ALERT = 38;

    public static final int FEATURE_STEP_DATE = 39;

    public static final int FEATURE_STEP_DATE = 39; // This represents a DATE. "STEP" is a typo.

    public static final int FEATURE_BLAZE_BUILD_PROGRESS = 40;

    public static final int FEATURE_EARTHQUAKE_OCCURRED = 41;

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

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

                    interactedSubcardRank,

                    interactedSubcardCardinality,

                    receivedLatencyMillis

                    receivedLatencyMillis,

                    null // Media cards cannot have subcards.

            )

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

            if (DEBUG) {