061669815a
If EnforcedAdmin is null, calling setDisabledByEnforcedAdmin does not disable the setting. So if this restriction was applied by a source different than admin, the toggle was still active for users to change (even non-main). After this change, the restriction is correctly processed both when it is applied by admin or by some other source. Bug: 356387759 Test: atest MultiUserSwitchBarControllerTest Flag: android.multiuser.fix_disabling_of_mu_toggle_when_restriction_applied Change-Id: I5d38e250359ccbee67ac747f1d8a0a2143f4c216
101 lines
3.7 KiB
Java
101 lines
3.7 KiB
Java
/*
|
|
* Copyright (C) 2018 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.users;
|
|
|
|
import android.content.Context;
|
|
import android.multiuser.Flags;
|
|
import android.os.UserHandle;
|
|
import android.os.UserManager;
|
|
import android.provider.Settings;
|
|
import android.util.Log;
|
|
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
import com.android.settings.widget.SwitchWidgetController;
|
|
import com.android.settingslib.RestrictedLockUtils;
|
|
import com.android.settingslib.RestrictedLockUtilsInternal;
|
|
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
|
import com.android.settingslib.core.lifecycle.events.OnStart;
|
|
import com.android.settingslib.core.lifecycle.events.OnStop;
|
|
|
|
public class MultiUserSwitchBarController implements SwitchWidgetController.OnSwitchChangeListener,
|
|
LifecycleObserver, OnStart, OnStop {
|
|
private static final String TAG = "MultiUserSwitchBarCtrl";
|
|
|
|
interface OnMultiUserSwitchChangedListener {
|
|
void onMultiUserSwitchChanged(boolean newState);
|
|
}
|
|
@VisibleForTesting
|
|
final SwitchWidgetController mSwitchBar;
|
|
|
|
private final Context mContext;
|
|
private final UserCapabilities mUserCapabilities;
|
|
private final OnMultiUserSwitchChangedListener mListener;
|
|
|
|
|
|
MultiUserSwitchBarController(Context context, SwitchWidgetController switchBar,
|
|
OnMultiUserSwitchChangedListener listener) {
|
|
mContext = context;
|
|
mSwitchBar = switchBar;
|
|
mListener = listener;
|
|
mUserCapabilities = UserCapabilities.create(context);
|
|
mSwitchBar.setChecked(mUserCapabilities.mUserSwitcherEnabled);
|
|
|
|
if (Flags.fixDisablingOfMuToggleWhenRestrictionApplied()) {
|
|
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = RestrictedLockUtilsInternal
|
|
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,
|
|
UserHandle.myUserId());
|
|
if (enforcedAdmin != null) {
|
|
mSwitchBar.setDisabledByAdmin(enforcedAdmin);
|
|
} else {
|
|
mSwitchBar.setEnabled(mUserCapabilities.mIsMain
|
|
&& !mUserCapabilities.mDisallowSwitchUser);
|
|
}
|
|
} else {
|
|
if (mUserCapabilities.mDisallowSwitchUser) {
|
|
mSwitchBar.setDisabledByAdmin(RestrictedLockUtilsInternal
|
|
.checkIfRestrictionEnforced(mContext, UserManager.DISALLOW_USER_SWITCH,
|
|
UserHandle.myUserId()));
|
|
} else {
|
|
mSwitchBar.setEnabled(mUserCapabilities.mIsMain);
|
|
}
|
|
}
|
|
mSwitchBar.setListener(this);
|
|
}
|
|
|
|
@Override
|
|
public void onStart() {
|
|
mSwitchBar.startListening();
|
|
}
|
|
|
|
@Override
|
|
public void onStop() {
|
|
mSwitchBar.stopListening();
|
|
}
|
|
|
|
@Override
|
|
public boolean onSwitchToggled(boolean isChecked) {
|
|
Log.d(TAG, "Toggling multi-user feature enabled state to: " + isChecked);
|
|
final boolean success = Settings.Global.putInt(mContext.getContentResolver(),
|
|
Settings.Global.USER_SWITCHER_ENABLED, isChecked ? 1 : 0);
|
|
if (success && mListener != null) {
|
|
mListener.onMultiUserSwitchChanged(isChecked);
|
|
}
|
|
return success;
|
|
}
|
|
}
|