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

Commit 9fef1626 authored by Sarup Dalwani's avatar Sarup Dalwani
Browse files

Avoiding NullPointer Exception for user properties in CPID update 

Bug: 258376391
Test: Manually tested
Change-Id: I5bb5032b764478be1b1f93104824834640ff0a90
parent 4fd04751

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,