From cb5dcaee3b315aeb6bb5d6eed04ffff3a2cadba2 Mon Sep 17 00:00:00 2001
From: Nikhil Kumar <nykkumar@google.com>
Date: Tue, 31 Jan 2023 13:12:00 +0000
Subject: [PATCH] SettingsActivity: Get profile parent using
 UserManager.getProfileParent

In the headless system user mode(hsum) non-primary users can also have a profile.
The existing implementation in SettingsActivity always gets the primary user as the profile parent, refactored the implementation to get profile parent using UserManager.getProfileParent.

Test: NA
Bug: 267162079
Change-Id: I2af581a4b7e3320f9351b862b7be3ef141b744b7
---
 src/com/android/settings/SettingsActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 143c92dc1aa..b36919057bd 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -466,7 +466,8 @@ public class SettingsActivity extends SettingsBaseActivity
             if (userInfo.isManagedProfile()) {
                 trampolineIntent.setClass(this, DeepLinkHomepageActivityInternal.class)
                         .putExtra(EXTRA_USER_HANDLE, getUser());
-                startActivityAsUser(trampolineIntent, um.getPrimaryUser().getUserHandle());
+                startActivityAsUser(trampolineIntent,
+                        um.getProfileParent(userInfo.id).getUserHandle());
             } else {
                 startActivity(trampolineIntent);
             }