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

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

Merge "Move engaged session state cleanup to destroy method" into main

parents a73c04e8 8ad4905d

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

+2 −0
Original line number Diff line number Diff line
@@ -948,6 +948,8 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 
                return;

            }

        }

        mService.onSessionUserEngagementStateChange(

                /* mediaSessionRecord= */ this, /* isUserEngaged= */ false);

        performOnCallbackHolders(

                "pushSessionDestroyed",

                holder -> {

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

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


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



        removeUserEngagedSession(session);

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

        mHandler.postSessionsChanged(session);

    }