Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES

Bug b/214031645 has all IC reviews approved and the feature has been
merged and tested for more than 3 months. Hence removing the feature
flag.

Bug: 214031645
Test: SettingsTest, SystemUITests
Change-Id: Iccec0a6b2325f9309c25522ad3f093c6bc1f45e6
This commit is contained in:
Kedar Chitnis
2022-08-18 05:14:26 +00:00
parent 5171a38fe2
commit 3ff8586db8
2 changed files with 33 additions and 82 deletions

View File

@@ -24,7 +24,6 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.UserManager;
import android.provider.Settings;
import android.util.FeatureFlagUtils;
import android.util.Log;
import androidx.appcompat.app.AlertDialog;
@@ -87,9 +86,7 @@ public class RemoveGuestOnExitPreferenceController extends BasePreferenceControl
|| !UserManager.isGuestUserAllowEphemeralStateChange()
|| !mUserCaps.isAdmin()
|| mUserCaps.disallowAddUser()
|| mUserCaps.disallowAddUserSetByAdmin()
|| !FeatureFlagUtils.isEnabled(mContext,
FeatureFlagUtils.SETTINGS_GUEST_MODE_UX_CHANGES)) {
|| mUserCaps.disallowAddUserSetByAdmin()) {
return DISABLED_FOR_USER;
} else {
return mUserCaps.mUserSwitcherEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;