From 89feb3697c3d6b369c608777fd8db454a6f93ec5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Budnik?= <ivanbuper@google.com>
Date: Wed, 22 Mar 2023 17:43:18 +0000
Subject: [PATCH] Enforce @NonNull package name for
 onMediaKeyEventSessionChanged

Previously, listeners could receive unexpected null package names.

Test: atest MediaSessionManagerTest
Bug: 274082657
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f8fd9975fba6ca0299b7b31f69422c90412790dd)
Merged-In: I0fdada5ed6d27a02ee0c1ab58423238c7651b5de
Change-Id: I0fdada5ed6d27a02ee0c1ab58423238c7651b5de
---
 media/java/android/media/session/MediaSessionManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index bf264f8f6ec4c..031c3fff1e8f6 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -107,7 +107,7 @@ public final class MediaSessionManager {
     private final Map<OnMediaKeyEventSessionChangedListener, Executor>
             mMediaKeyEventSessionChangedCallbacks = new HashMap<>();
     @GuardedBy("mLock")
-    private String mCurMediaKeyEventSessionPackage;
+    private String mCurMediaKeyEventSessionPackage = "";
     @GuardedBy("mLock")
     private MediaSession.Token mCurMediaKeyEventSession;
     @GuardedBy("mLock")