From 9fef1626e2e0d291f59a2b2f3dd6a64a04f6da68 Mon Sep 17 00:00:00 2001
From: Sarup Dalwani <sarup@google.com>
Date: Fri, 13 Jan 2023 06:31:30 +0000
Subject: [PATCH] Avoiding NullPointer Exception for user properties in CPID
 update

Bug: 258376391
Test: Manually tested
Change-Id: I5bb5032b764478be1b1f93104824834640ff0a90
---
 .../com/android/server/pm/CrossProfileIntentFilterHelper.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/CrossProfileIntentFilterHelper.java b/services/core/java/com/android/server/pm/CrossProfileIntentFilterHelper.java
index e682586314ac4..51214faca730d 100644
--- a/services/core/java/com/android/server/pm/CrossProfileIntentFilterHelper.java
+++ b/services/core/java/com/android/server/pm/CrossProfileIntentFilterHelper.java
@@ -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,