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

Commit 3c11efe2 authored by Bishoy Gendy's avatar Bishoy Gendy Committed by Automerger Merge Worker
Browse files

Merge "Use Slog instead of EventLogger in MediaSessionStack" into tm-qpr-dev am: 3986c0f8 

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



Change-Id: Ia82856862024b82ff4bbcac63eee9481f9061c5f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ab8e986f 3986c0f8

services/core/java/com/android/server/media/MediaSessionStack.java

+14 −0
Original line number Diff line number Diff line
@@ -21,7 +21,9 @@ import static com.android.server.media.MediaSessionPolicyProvider.SESSION_POLICY 
import android.media.Session2Token;

import android.media.session.MediaSession;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.util.Slog;

import android.util.SparseArray;



import java.io.PrintWriter;
@@ -82,6 +84,10 @@ class MediaSessionStack { 
     * @param record The record to add.

     */

    public void addSession(MediaSessionRecordImpl record) {

        Slog.i(TAG, TextUtils.formatSimple(

                "addSession to bottom of stack | record: %s",

                record

        ));

        mSessions.add(record);

        clearCache(record.getUserId());
@@ -97,6 +103,10 @@ class MediaSessionStack { 
     * @param record The record to remove.

     */

    public void removeSession(MediaSessionRecordImpl record) {

        Slog.i(TAG, TextUtils.formatSimple(

                "removeSession | record: %s",

                record

        ));

        mSessions.remove(record);

        if (mMediaButtonSession == record) {

            // When the media button session is removed, nullify the media button session and do not
@@ -142,6 +152,10 @@ class MediaSessionStack { 
    public void onPlaybackStateChanged(

            MediaSessionRecordImpl record, boolean shouldUpdatePriority) {

        if (shouldUpdatePriority) {

            Slog.i(TAG, TextUtils.formatSimple(

                    "onPlaybackStateChanged - Pushing session to top | record: %s",

                    record

            ));

            mSessions.remove(record);

            mSessions.add(0, record);

            clearCache(record.getUserId());