PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Credential Manager Settings Improvement Bug fixes

Browse Source 
Bug: 372715083
Flag: Flag EXEMPT manual tests
Change-Id: I386bc590955d762af0370e7ff5d6fbece55b564d
This commit is contained in:
Joy Babafemi
2024-12-09 03:02:47 +00:00
parent 4d5fe47420
commit d3807e554d
16 changed files with 136 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/applications/credentials/CredentialsPickerActivity.java
View File

@@ -33,11 +33,12 @@ import com.android.settings.SettingsActivity;
*/
public class CredentialsPickerActivity extends SettingsActivity {
private static final String TAG = "CredentialsPickerActivity";
private boolean mIsWorkProfile;
private boolean mIsPrivateSpace;
/** Injects the fragment name into the intent so the correct fragment is opened. */
@VisibleForTesting
public static void injectFragmentIntoIntent(Context context, Intent intent) {
final int userId = UserHandle.myUserId();
public static void injectFragmentIntoIntent(Context context, Intent intent, int userId) {
final UserManager userManager = UserManager.get(context);
if (DefaultCombinedPickerWork.isUserHandledByFragment(userManager, userId)) {
@@ -57,8 +58,12 @@ public class CredentialsPickerActivity extends SettingsActivity {
final String packageName = getCallingPackage();
final Intent intent = getIntent();
mIsWorkProfile = intent.getBooleanExtra(UserUtils.EXTRA_IS_WORK_PROFILE, false);
mIsPrivateSpace = intent.getBooleanExtra(UserUtils.EXTRA_IS_PRIVATE_SPACE, false);
intent.putExtra(DefaultCombinedPicker.EXTRA_PACKAGE_NAME, packageName);
injectFragmentIntoIntent(this, intent);
injectFragmentIntoIntent(this, intent, UserUtils.getUser(
mIsWorkProfile, mIsPrivateSpace, this));
super.onCreate(savedInstanceState);
}