From 20b7cdcda886add9322c7a2cb2ab9982c2e75f23 Mon Sep 17 00:00:00 2001 From: Manish Singh Date: Fri, 15 Mar 2024 12:25:51 +0000 Subject: [PATCH] Return my user id Since the current context is the correct one, we can simply return myUserId - just like for the managed profile. Bug: 329784721 Test: manual Change-Id: Ifbc13b0d87ba7b06c6d04c3442bbac0580c4cf3e --- .../credentials/DefaultCombinedPickerPrivate.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java index 52adc4de2a3..800c9176296 100644 --- a/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java +++ b/src/com/android/settings/applications/credentials/DefaultCombinedPickerPrivate.java @@ -16,18 +16,14 @@ package com.android.settings.applications.credentials; +import android.os.UserHandle; import android.os.UserManager; -import com.android.settings.Utils; -import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType; - public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker { - private static final String TAG = "DefaultCombinedPickerPrivate"; @Override protected int getUser() { - UserManager userManager = getContext().getSystemService(UserManager.class); - return Utils.getCurrentUserIdOfType(userManager, ProfileType.PRIVATE); + return UserHandle.myUserId(); } /** Returns whether the user is handled by this fragment. */