Merge "Fix possible NPE in MediaSessionManager" into pi-dev

am: ed01dfba3e Change-Id: I23892e1e97ef5dee8536164a14c8dd671696a0ef
2018-04-12 00:02:42 -07:00
parent 03fb807d3a ed01dfba3e
commit ae93c58779
1 changed files with 4 additions and 1 deletions
--- 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;
        }