commit bba60fadc7faeefe6afa3fe530e5c7ad36ee4d26
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jul 26 18:41:38 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 26 18:41:38 2017 +0000
tree 8de7f6bdc028ddb90379e6b9cdaa9ed798de7ddc
parent d7ff18dac8f9bb618977bfcfb293e49ded056121
parent 097feb206815a105a027ab90960a97184300ff88

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

services/core/java/com/android/server/media/MediaRouterService.java

diff --git a/services/core/java/com/android/server/media/MediaRouterService.java b/services/core/java/com/android/server/media/MediaRouterService.java
index 5ba8f48..922df1e 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 @@
     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;