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

Commit bb562398 authored by Priyanka Advani (xWF)'s avatar Priyanka Advani (xWF) Committed by Android (Google) Code Review
Browse files

Revert "wifi: Add new user restrictions" 

This reverts commit f149e793.

Reason for revert: Droidmonitor created revert due to b/431281371. Will be verifying through ABTD before submission.

Fix: 431281371
Bug: 390240471
Change-Id: Ia7005ad99c0fc16095f9a554d9da6f86f9dd9e62
parent f149e793

AconfigFlags.bp

+0 −1
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ aconfig_declarations_group { 
        "surfaceflinger_flags_java_lib",

        "telecom_flags_core_java_lib",

        "telephony_flags_core_java_lib",

        "wifi_framework_aconfig_flags_lib",

        // !!! KEEP THIS LIST ALPHABETICAL !!!

    ],

}

core/api/module-lib-current.txt

+0 −5
Original line number Diff line number Diff line
@@ -503,11 +503,6 @@ package android.os { 
    method @FlaggedApi("android.os.update_engine_api") public void triggerPostinstall(@NonNull String);

  }



  public class UserManager {

    field @FlaggedApi("com.android.wifi.flags.multi_user_wifi_enhancement") public static final String DISALLOW_CONFIG_WIFI_PRIVATE = "no_config_wifi_private";

    field @FlaggedApi("com.android.wifi.flags.multi_user_wifi_enhancement") public static final String DISALLOW_CONFIG_WIFI_SHARED = "no_config_wifi_shared";

  }



}



package android.os.storage {

core/java/android/os/UserManager.java

+0 −44
Original line number Diff line number Diff line
@@ -345,50 +345,6 @@ public class UserManager { 
     */

    public static final String DISALLOW_CONFIG_WIFI = "no_config_wifi";



    /**

     * Specifies if a user is disallowed from adding or editing private Wi-Fi configurations,

     * that is, Wi-Fi configurations that are not shared with other users.

     *

     * Use {@link #DISALLOW_CONFIG_WIFI} if all types of Wi-Fi configurations are disallowed to

     * be added or edited.

     *

     * Note: This restriction is used for system only, it can't be used via

     * the DevicePolicyManager APIs.

     *

     * <p>The default value is <code>false</code>.

     *

     * <p>Key for user restrictions.

     * <p>Type: Boolean

     * @see #getUserRestrictions()

     *

     * @hide

     */

    @FlaggedApi(com.android.wifi.flags.Flags.FLAG_MULTI_USER_WIFI_ENHANCEMENT)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String DISALLOW_CONFIG_WIFI_PRIVATE = "no_config_wifi_private";



    /**

     * Specifies if a user is disallowed from adding or editing shared Wi-Fi configurations,

     * that is, Wi-Fi configurations that are shared with other users.

     *

     * Use {@link #DISALLOW_CONFIG_WIFI} if all types of Wi-Fi configurations are disallowed

     * to be added or edited.

     *

     * Note: This restriction is used for system only, it can't be used via

     * the DevicePolicyManager APIs.

     *

     * <p>The default value is <code>false</code>.

     *

     * <p>Key for user restrictions.

     * <p>Type: Boolean

     * @see #getUserRestrictions()

     *

     * @hide

     */

    @FlaggedApi(com.android.wifi.flags.Flags.FLAG_MULTI_USER_WIFI_ENHANCEMENT)

    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)

    public static final String DISALLOW_CONFIG_WIFI_SHARED = "no_config_wifi_shared";



    /**

     * Specifies if a user is disallowed from enabling/disabling Wi-Fi.

     *

services/core/java/com/android/server/pm/UserRestrictionsUtils.java

+0 −2
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ public class UserRestrictionsUtils { 


    public static final Set<String> USER_RESTRICTIONS = newSetWithUniqueCheck(new String[] {

            UserManager.DISALLOW_CONFIG_WIFI,

            UserManager.DISALLOW_CONFIG_WIFI_PRIVATE,

            UserManager.DISALLOW_CONFIG_WIFI_SHARED,

            UserManager.DISALLOW_CONFIG_LOCALE,

            UserManager.DISALLOW_MODIFY_ACCOUNTS,

            UserManager.DISALLOW_INSTALL_APPS,