From 3715ec579af92cebc63670755d8c17850c88faff Mon Sep 17 00:00:00 2001
From: Sungsoo Lim <sungsoo@google.com>
Date: Wed, 11 Apr 2018 15:59:35 +0900
Subject: Fix possible NPE in MediaSessionManager

Bug: 77885219
Test: build
Change-Id: Id20dd73f00521beeccd4704f722547ba32bb5722
---
 media/java/android/media/session/MediaSessionManager.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index fbc143845509..f35810322cd5 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -354,7 +354,10 @@ public final class MediaSessionManager {
      * @return {@code true} if the remote user is trusted and its package name matches with the UID.
      *            {@code false} otherwise.
      */
-    public boolean isTrustedForMediaControl(RemoteUserInfo userInfo) {
+    public boolean isTrustedForMediaControl(@NonNull RemoteUserInfo userInfo) {
+        if (userInfo == null) {
+            throw new IllegalArgumentException("userInfo may not be null");
+        }
         if (userInfo.getPackageName() == null) {
             return false;
         }
-- 
cgit v1.2.3-59-g8ed1b