Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95baa776 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by android-build-merger
Browse files

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

am: bba60fad

Change-Id: I28dbb73021ea5bfeec3fda3e35849ad446d65102
parents 96681b8f bba60fad

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

+1 −1
Original line number Diff line number Diff line
@@ -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;