From 7b3cae36800700c5d15466efe55c5cab8f382833 Mon Sep 17 00:00:00 2001 From: Jaewan Kim Date: Thu, 7 Jun 2018 10:16:22 +0900 Subject: [PATCH] MediaSessionService: Fix NPE Bug: 109766690 Test: Run CtsMediaTests Change-Id: Id94bc1a4c46a28f920b10e39c0ada7ad6a90fc01 --- services/core/java/com/android/server/media/MediaSessionService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java index 6fff3676ac8d..68b2a583e020 100644 --- a/services/core/java/com/android/server/media/MediaSessionService.java +++ b/services/core/java/com/android/server/media/MediaSessionService.java @@ -781,6 +781,9 @@ public class MediaSessionService extends SystemService implements Monitor { } private void dispatchVolumeKeyLongPressLocked(KeyEvent keyEvent) { + if (mCurrentFullUserRecord.mOnVolumeKeyLongPressListener == null) { + return; + } try { mCurrentFullUserRecord.mOnVolumeKeyLongPressListener.onVolumeKeyLongPress(keyEvent); } catch (RemoteException e) { -- 2.11.0