Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c108c36 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a setting to control multi-user feature on/off."

parents fdbc313a c69c8b60

core/java/android/os/UserManager.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -2667,6 +2667,12 @@ public class UserManager { 
        if (isDeviceInDemoMode(mContext)) {

        if (isDeviceInDemoMode(mContext)) {

            return false;

            return false;

        }

        }

        // If user disabled this feature, don't show switcher

        final boolean userSwitcherEnabled = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.USER_SWITCHER_ENABLED, 1) != 0;

        if (!userSwitcherEnabled) {

            return false;

        }

        List<UserInfo> users = getUsers(true);

        List<UserInfo> users = getUsers(true);

        if (users == null) {

        if (users == null) {

           return false;

           return false;

core/java/android/provider/Settings.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -9431,6 +9431,12 @@ public final class Settings { 
        */

        */

       public static final String USE_GOOGLE_MAIL = "use_google_mail";

       public static final String USE_GOOGLE_MAIL = "use_google_mail";




















        /**














         * Whether or not switching/creating users is enabled by user.














         * @hide














         */














        public static final String USER_SWITCHER_ENABLED = "user_switcher_enabled";
























        /**







        /**











         * Webview Data reduction proxy key.







         * Webview Data reduction proxy key.











         * @hide







         * @hide

































core/tests/coretests/src/android/provider/SettingsBackupTest.java



+1
−0




























Original line number
Original line
Diff line number
Diff line








@@ -442,6 +442,7 @@ public class SettingsBackupTest {









                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,







                    Settings.Global.ENABLE_GNSS_RAW_MEAS_FULL_TRACKING,











                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,







                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT,











                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS,







                    Settings.Global.INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS,














                    Settings.Global.USER_SWITCHER_ENABLED,











                    Settings.Global.NETWORK_ACCESS_TIMEOUT_MS,







                    Settings.Global.NETWORK_ACCESS_TIMEOUT_MS,











                    Settings.Global.WARNING_TEMPERATURE,







                    Settings.Global.WARNING_TEMPERATURE,











                    Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,







                    Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY,