Merge "Return my user id" into main

This commit is contained in:
Manish Singh
2024-03-15 16:55:36 +00:00
committed by Android (Google) Code Review

View File

@@ -16,18 +16,14 @@
package com.android.settings.applications.credentials; package com.android.settings.applications.credentials;
import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import com.android.settings.Utils;
import com.android.settings.dashboard.profileselector.ProfileSelectFragment.ProfileType;
public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker { public class DefaultCombinedPickerPrivate extends DefaultCombinedPicker {
private static final String TAG = "DefaultCombinedPickerPrivate";
@Override @Override
protected int getUser() { protected int getUser() {
UserManager userManager = getContext().getSystemService(UserManager.class); return UserHandle.myUserId();
return Utils.getCurrentUserIdOfType(userManager, ProfileType.PRIVATE);
} }
/** Returns whether the user is handled by this fragment. */ /** Returns whether the user is handled by this fragment. */