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

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

Merge "Use original package name as placeholder after release" into main

parents f434183d fba4c854

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

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

        mPackageName = ownerPackageName;

        mTag = tag;

        mTag = tag;

        mSessionInfo = sessionInfo;

        mSessionInfo = sessionInfo;

        mController = new ControllerStub(this);

        mController = new ControllerStub(this, ownerPackageName);

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

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

        mSession = new SessionStub(this);

        mSession = new SessionStub(this);

        mSessionCb = new SessionCb(cb);

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




    private static final class ControllerStub extends ISessionController.Stub {

    private static final class ControllerStub extends ISessionController.Stub {

        private final WeakReference<MediaSessionRecord> mRecord;

        private final WeakReference<MediaSessionRecord> mRecord;

        private final String mPackageName;





        ControllerStub(MediaSessionRecord record) {

        ControllerStub(MediaSessionRecord record, String packageName) {

            mRecord = new WeakReference<>(record);

            mRecord = new WeakReference<>(record);

            mPackageName = packageName;

        }

        }





        public void release() {

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

            MediaSessionRecord record = mRecord.get();

            if (record == null) {

            if (record == null) {

                Log.w(TAG, IGNORE_CALL_TO_DESTROYED_SESSION_MESSAGE);

                Log.w(TAG, IGNORE_CALL_TO_DESTROYED_SESSION_MESSAGE);

                return "";

                return mPackageName;

            }

            }

            return record.getPackageName();

            return record.getPackageName();

        }

        }