401ebcb53d
This fixes a bug where the picker is not using the correct user id and also ensures that the settings activity uses the correct user when launched. Test: flash & test w/ work profile Bug 322071206 Change-Id: I846593ff9ae320d9bb774e3e79ed9ef41f101ff5
46 lines
1.7 KiB
Java
46 lines
1.7 KiB
Java
/*
|
|
* Copyright (C) 2023 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
package com.android.settings.applications.credentials;
|
|
|
|
import android.os.UserManager;
|
|
import android.util.Slog;
|
|
|
|
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);
|
|
}
|
|
|
|
/** Returns whether the user is handled by this fragment. */
|
|
public static boolean isUserHandledByFragment(UserManager userManager) {
|
|
try {
|
|
// If there is no private profile then this will throw an exception.
|
|
Utils.getCurrentUserIdOfType(userManager, ProfileType.PRIVATE);
|
|
return true;
|
|
} catch (IllegalStateException e) {
|
|
Slog.e(TAG, "Failed to get private profile user id", e);
|
|
return false;
|
|
}
|
|
}
|
|
}
|