From ff94d116887b0a801be3f928ca71ab4cb28a3254 Mon Sep 17 00:00:00 2001
From: Cynthia Wasonga <wasonga@google.com>
Date: Fri, 30 Sep 2022 09:50:20 +0000
Subject: [PATCH] Fix profile removed broadcast being sent for non-profile user

Bug: 249499651
Test: manual test via adb shell
Change-Id: I5208694773901d303a4719d54230202de40c1e60
---
 .../core/java/com/android/server/pm/UserManagerService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index c77459da8cecc..56f5995ca5d0d 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -5289,7 +5289,8 @@ public class UserManagerService extends IUserManager.Stub {
                 Slog.w(LOG_TAG, "Unable to notify AppOpsService of removing user.", e);
             }
 
-            if (userData.info.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID) {
+            if (userData.info.profileGroupId != UserInfo.NO_PROFILE_GROUP_ID
+                    && userData.info.isProfile()) {
                 sendProfileRemovedBroadcast(userData.info.profileGroupId, userData.info.id,
                         userData.info.userType);
             }