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

Commit 3e5ce5be authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Enforce @NonNull package name for onMediaKeyEventSessionChanged" into... 

Merge "Enforce @NonNull package name for onMediaKeyEventSessionChanged" into tm-qpr-dev am: 4fdaf48b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22224343



Change-Id: I0accab1f535d030670fa2b8d352d3d6ee2965e13
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents acf9bee7 4fdaf48b

media/java/android/media/session/MediaSessionManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -107,7 +107,7 @@ public final class MediaSessionManager { 
    private final Map<OnMediaKeyEventSessionChangedListener, Executor>

    private final Map<OnMediaKeyEventSessionChangedListener, Executor>

            mMediaKeyEventSessionChangedCallbacks = new HashMap<>();

            mMediaKeyEventSessionChangedCallbacks = new HashMap<>();

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private String mCurMediaKeyEventSessionPackage;

    private String mCurMediaKeyEventSessionPackage = "";

    @GuardedBy("mLock")

    @GuardedBy("mLock")

    private MediaSession.Token mCurMediaKeyEventSession;

    private MediaSession.Token mCurMediaKeyEventSession;

    @GuardedBy("mLock")

    @GuardedBy("mLock")