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

Commit 7ea6ab32 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Automerger Merge Worker
Browse files

Merge "Keep smartspace session object" into udc-dev am: 441e1e19 

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



Change-Id: I4273090e610692fb5971dfe4f265c86c10f519c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cbc30ad2 441e1e19

packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt

+4 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import android.text.TextUtils 
import android.util.Log

import android.util.Pair as APair

import androidx.media.utils.MediaConstants

import com.android.internal.annotations.Keep

import com.android.internal.logging.InstanceId

import com.android.keyguard.KeyguardUpdateMonitor

import com.android.systemui.Dumpable
@@ -219,7 +220,7 @@ class MediaDataManager( 
    private val mediaEntries: LinkedHashMap<String, MediaData> = LinkedHashMap()

    // There should ONLY be at most one Smartspace media recommendation.

    var smartspaceMediaData: SmartspaceMediaData = EMPTY_SMARTSPACE_MEDIA_DATA

    private var smartspaceSession: SmartspaceSession? = null

    @Keep private var smartspaceSession: SmartspaceSession? = null

    private var allowMediaRecommendations = allowMediaRecommendations(context)



    private val artworkWidth =
@@ -381,6 +382,8 @@ class MediaDataManager( 


    fun destroy() {

        smartspaceMediaDataProvider.unregisterListener(this)

        smartspaceSession?.close()

        smartspaceSession = null

        context.unregisterReceiver(appChangeReceiver)

    }