Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I569ccf1cc273d44451afd660d514f56f4f88979c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Gautam Shende
2022-10-12 01:34:46 +00:00
committed by Automerger Merge Worker
parent 2403a9d144 cdcefab351
commit ad2c02de1e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/app/smartspace/SmartspaceTarget.java
View File

@@ -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.

3
packages/SystemUI/src/com/android/systemui/media/MediaCarouselController.kt
View File

@@ -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) {