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

Commit ddcb7f5c authored by Amit Pawar's avatar Amit Pawar Committed by android-build-merger
Browse files

Merge "Fix NPE in MediaRouterService" into oc-mr1-dev am: 486b37cd 

am: 53987bf5

Change-Id: If7816b6ea62f159a3e0057d1ca98caf8cab23360
parents e37bdbeb 53987bf5

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;