Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove wifi scan-always dialog." into jb-mr2-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2013-05-13 21:11:32 +00:00
committed by Android (Google) Code Review
parent 98f9956d2a aee3d28763
commit 28d3dbf969
2 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/provider/Settings.java
View File

@@ -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

9
wifi/java/android/net/wifi/WifiManager.java
View File

@@ -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.