Remove wifi scan-always dialog.

Removes intent type for dialog and Setting on whether to show
dialog.

bug:8907190
Change-Id: Id37e03126d4afdfd7d921132a57233b84603c8bd

diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index 38fb51b..2725f6a 100644 (file)
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -4842,14 +4842,6 @@ public final class Settings {
                 "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
         * the user turns off tethering.

diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java
index a7a5924..ec76a8b 100644 (file)
--- a/wifi/java/android/net/wifi/WifiManager.java
+++ b/wifi/java/android/net/wifi/WifiManager.java
@@ -408,15 +408,6 @@ public class WifiManager {
             "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.
      * <p>Output: Nothing.