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

Commit 03574625 authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Log DREAM_OVERLAY surface for media recommendation card." into tm-dev... 

Merge "Log DREAM_OVERLAY surface for media recommendation card." into tm-dev am: f52cba87 am: 69ac6bdf

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



Change-Id: I93dad9683b608b489c845a8b4cbbde5a9e3fc50a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a5764d4c 69ac6bdf

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

+8 −4
Original line number Diff line number Diff line
@@ -228,7 +228,8 @@ class MediaCarouselController @Inject constructor( 
                                it.mUid,

                                surfaces = intArrayOf(

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN),

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY),

                                rank = MediaPlayerData.getMediaPlayerIndex(key))

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

                    }
@@ -251,7 +252,8 @@ class MediaCarouselController @Inject constructor( 
                                    it.mUid,

                                    surfaces = intArrayOf(

                                            SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,

                                            SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN),

                                            SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,

                                            SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY),

                                    rank = index,

                                    receivedLatencyMillis = receivedSmartspaceCardLatency)

                            /* ktlint-disable max-line-length */
@@ -307,7 +309,8 @@ class MediaCarouselController @Inject constructor( 
                                        it.mUid,

                                        surfaces = intArrayOf(

                                                SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,

                                                SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN),

                                                SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,

                                                SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY),

                                        rank = index,

                                        receivedLatencyMillis = (systemClock.currentTimeMillis() - data.headphoneConnectionTimeMillis).toInt())

                                /* ktlint-disable max-line-length */
@@ -322,7 +325,8 @@ class MediaCarouselController @Inject constructor( 
                                it.mUid,

                                surfaces = intArrayOf(

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE,

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN),

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN,

                                        SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY),

                                rank = MediaPlayerData.getMediaPlayerIndex(key),

                                receivedLatencyMillis = (systemClock.currentTimeMillis() - data.headphoneConnectionTimeMillis).toInt())

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

packages/SystemUI/src/com/android/systemui/media/MediaControlPanel.java

+2 −0
Original line number Diff line number Diff line
@@ -1270,6 +1270,8 @@ public class MediaControlPanel { 
            return SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__SHADE;

        } else if (currentEndLocation == MediaHierarchyManager.LOCATION_LOCKSCREEN) {

            return SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__LOCKSCREEN;

        } else if (currentEndLocation == MediaHierarchyManager.LOCATION_DREAM_OVERLAY) {

            return SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DREAM_OVERLAY;

        }

        return SysUiStatsLog.SMART_SPACE_CARD_REPORTED__DISPLAY_SURFACE__DEFAULT_SURFACE;

    }