Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sarup Dalwani
2023-01-13 17:54:48 +00:00
committed by Android (Google) Code Review
parent 69b95f3d14 9fef1626e2
commit 81d4c5589b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/pm/CrossProfileIntentFilterHelper.java
View File

@@ -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,