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

Commit fba4c854 authored by tonihei's avatar tonihei
Browse files

Use original package name as placeholder after release 

This prevents returning an empty string as the package name
when a controller attempts to connect after the session is
released.

Bug: 419856408
Flag: EXEMPT bugfix
Test: new test in same topic
Change-Id: Ib9a2a8e3eba47879eba5237c1dff2b6721100e7d
parent 66a34042

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

+5 −3
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 
        mPackageName = ownerPackageName;

        mTag = tag;

        mSessionInfo = sessionInfo;

        mController = new ControllerStub(this);

        mController = new ControllerStub(this, ownerPackageName);

        mSessionToken = new MediaSession.Token(ownerUid, mController);

        mSession = new SessionStub(this);

        mSessionCb = new SessionCb(cb);
@@ -2139,9 +2139,11 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 


    private static final class ControllerStub extends ISessionController.Stub {

        private final WeakReference<MediaSessionRecord> mRecord;

        private final String mPackageName;



        ControllerStub(MediaSessionRecord record) {

        ControllerStub(MediaSessionRecord record, String packageName) {

            mRecord = new WeakReference<>(record);

            mPackageName = packageName;

        }



        public void release() {
@@ -2199,7 +2201,7 @@ public class MediaSessionRecord extends MediaSessionRecordImpl implements IBinde 
            MediaSessionRecord record = mRecord.get();

            if (record == null) {

                Log.w(TAG, IGNORE_CALL_TO_DESTROYED_SESSION_MESSAGE);

                return "";

                return mPackageName;

            }

            return record.getPackageName();

        }