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

Commit f1eaa8b3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove session from user engaged list when destroyed" into main

parents c4855aa6 538b1408

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -587,8 +587,8 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 
            mSession.release();

            mSession.release();

            mDestroyed = true;

            mDestroyed = true;

            mPlaybackState = null;

            mPlaybackState = null;

            updateUserEngagedStateIfNeededLocked(

            mUserEngagementState = USER_DISENGAGED;

                    /* isTimeoutExpired= */ true, /* isGlobalPrioritySessionActive= */ false);

            mHandler.removeCallbacks(mUserEngagementTimeoutExpirationRunnable);

            mHandler.post(MessageHandler.MSG_DESTROYED);

            mHandler.post(MessageHandler.MSG_DESTROYED);

        }

        }

    }

    }

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -687,6 +687,7 @@ public class MediaSessionService extends SystemService implements Monitor { 




        Log.d(TAG, "destroySessionLocked: record=" + session);

        Log.d(TAG, "destroySessionLocked: record=" + session);





        removeUserEngagedSession(session);

        reportMediaInteractionEvent(session, /* userEngaged= */ false);

        reportMediaInteractionEvent(session, /* userEngaged= */ false);

        mHandler.postSessionsChanged(session);

        mHandler.postSessionsChanged(session);

    }

    }