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

This commit is contained in:
TreeHugger Robot
2018-04-12 06:51:52 +00:00
committed by Android (Google) Code Review

View File

@@ -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;
}