Merge "Fix NPE in MediaRouterService" into oc-mr1-dev (53987bf5) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -355,7 +355,7 @@ public final class MediaRouterService extends IMediaRouterService.Stub
	void restoreRoute(int uid) {		void restoreRoute(int uid) {
	ClientRecord clientRecord = null;		ClientRecord clientRecord = null;
	UserRecord userRecord = mUserRecords.get(UserHandle.getUserId(uid));		UserRecord userRecord = mUserRecords.get(UserHandle.getUserId(uid));
	if (userRecord.mClientRecords != null) {		if (userRecord != null && userRecord.mClientRecords != null) {
	for (ClientRecord cr : userRecord.mClientRecords) {		for (ClientRecord cr : userRecord.mClientRecords) {
	if (validatePackageName(uid, cr.mPackageName)) {		if (validatePackageName(uid, cr.mPackageName)) {
	clientRecord = cr;		clientRecord = cr;