Merge "SettingsActivity: Get profile parent using UserManager.getProfileParent"
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 143c92d..b369190 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -466,7 +466,8 @@
             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);
             }