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

Commit 23abefef authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 28d3dbf9: Merge "Remove wifi scan-always dialog." into jb-mr2-dev 

* commit '28d3dbf9':
  Remove wifi scan-always dialog.
parents 0038342d 28d3dbf9

core/java/android/provider/Settings.java

+0 −8
Original line number Diff line number Diff line
@@ -4841,14 +4841,6 @@ public final class Settings { 
       public static final String WIFI_SCAN_ALWAYS_AVAILABLE =

                "wifi_scan_always_enabled";



       /**

        * Setting to indicate whether the user should be notified that scans are still

        * available when Wi-Fi is turned off

        * @hide

        */

       public static final String WIFI_NOTIFY_SCAN_ALWAYS_AVAILABLE =

                "wifi_notify_scan_always_enabled";



       /**

        * Used to save the Wifi_ON state prior to tethering.

        * This state will be checked to restore Wifi after

wifi/java/android/net/wifi/WifiManager.java

+0 −9
Original line number Diff line number Diff line
@@ -407,15 +407,6 @@ public class WifiManager { 
    public static final String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE =

            "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";



    /**

     * Activity Action: Show a system activity that notifies the user that

     * scanning is still available when Wi-Fi is turned off

     * @hide

     */

    @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION)

    public static final String ACTION_NOTIFY_SCAN_ALWAYS_AVAILABLE =

            "android.net.wifi.action.NOTIFY_SCAN_ALWAYS_AVAILABLE";



    /**

     * Activity Action: Pick a Wi-Fi network to connect to.

     * <p>Input: Nothing.