Merge "Use original package name as placeholder after release" into main (ce2befee) · Commits · e / os / android_frameworks_base

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);
		@@ -2141,9 +2141,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() {
		@@ -2201,7 +2203,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();
		}