Merge "Fix NPE in MediaRouterService" into oc-dr1-dev

1 files changed, 1 insertions, 1 deletions

diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java
index 5ba8f4853407..922df1e3dba8 100644
--- a/services/core/java/com/android/server/media/MediaRouterService.java
+++ b/services/core/java/com/android/server/media/MediaRouterService.java
@@ -355,7 +355,7 @@ public final class MediaRouterService extends IMediaRouterService.Stub
     void restoreRoute(int uid) {
         ClientRecord clientRecord = null;
         UserRecord userRecord = mUserRecords.get(UserHandle.getUserId(uid));
-        if (userRecord.mClientRecords != null) {
+        if (userRecord != null && userRecord.mClientRecords != null) {
             for (ClientRecord cr : userRecord.mClientRecords) {
                 if (validatePackageName(uid, cr.mPackageName)) {
                     clientRecord = cr;