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

Commit 81d4c558 authored by Sarup Dalwani's avatar Sarup Dalwani Committed by Android (Google) Code Review
Browse files

Merge "Avoiding NullPointer Exception for user properties in CPID update"

parents 69b95f3d 9fef1626

services/core/java/com/android/server/pm/CrossProfileIntentFilterHelper.java

+2 −1
Original line number Diff line number Diff line
@@ -54,7 +54,8 @@ public class CrossProfileIntentFilterHelper { 
            UserProperties currentUserProperties = mUserManagerInternal

                    .getUserProperties(userInfo.id);



            if (currentUserProperties.getUpdateCrossProfileIntentFiltersOnOTA()) {

            if (currentUserProperties != null

                    && currentUserProperties.getUpdateCrossProfileIntentFiltersOnOTA()) {

                int parentUserId = mUserManagerInternal.getProfileParentId(userInfo.id);

                if (parentUserId != userInfo.id) {

                    clearCrossProfileIntentFilters(userInfo.id,