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

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

Merge "Always show wifi wake setting."

parents 3023aab5 250d7849

core/java/android/provider/Settings.java

+0 −11
Original line number Diff line number Diff line
@@ -9314,17 +9314,6 @@ public final class Settings { 


        private static final Validator WIFI_WAKEUP_ENABLED_VALIDATOR = BOOLEAN_VALIDATOR;



        /**

         * Value to specify if Wi-Fi Wakeup is available.

         *

         * Wi-Fi Wakeup will only operate if it's available

         * and {@link #WIFI_WAKEUP_ENABLED} is true.

         *

         * Type: int (0 for false, 1 for true)

         * @hide

         */

        public static final String WIFI_WAKEUP_AVAILABLE = "wifi_wakeup_available";



        /**

         * Value to specify whether network quality scores and badging should be shown in the UI.

         *

core/proto/android/providers/settings.proto

+1 −1
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ message GlobalSettingsProto { 
    optional SettingProto wifi_on = 136 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto wifi_scan_always_available = 137 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto wifi_wakeup_enabled = 138 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto wifi_wakeup_available = 305 [ (android.privacy).dest = DEST_AUTOMATIC ];

    reserved 305; // Removed wifi_wakeup_available

    optional SettingProto network_scoring_ui_enabled = 306 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto speed_label_cache_eviction_age_millis = 307 [ (android.privacy).dest = DEST_AUTOMATIC ];

    optional SettingProto recommended_network_evaluator_cache_expiry_ms = 308 [ (android.privacy).dest = DEST_AUTOMATIC ];

core/res/res/values/config.xml

+0 −6
Original line number Diff line number Diff line
@@ -432,12 +432,6 @@ 
    <!-- Activity name to enable wifi tethering after provisioning app succeeds -->

    <string translatable="false" name="config_wifi_tether_enable">com.android.settings/.wifi.tether.TetherService</string>



    <!-- Controls the WiFi wakeup feature.

          0 = Not available.

          1 = Available.

     -->

    <integer translatable="false" name="config_wifi_wakeup_available">1</integer>



    <!-- Array of ConnectivityManager.TYPE_xxxx values allowable for tethering.



         Common options are [1, 4] for TYPE_WIFI and TYPE_MOBILE_DUN or

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -2152,7 +2152,6 @@ 
  <java-symbol type="string" name="config_mobile_hotspot_provision_response" />

  <java-symbol type="integer" name="config_mobile_hotspot_provision_check_period" />

  <java-symbol type="string" name="config_wifi_tether_enable" />

  <java-symbol type="integer" name="config_wifi_wakeup_available" />

  <java-symbol type="bool" name="config_intrusiveNotificationLed" />

  <java-symbol type="bool" name="config_notificationBadging" />

  <java-symbol type="dimen" name="preference_fragment_padding_bottom" />

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

+0 −1
Original line number Diff line number Diff line
@@ -436,7 +436,6 @@ public class SettingsBackupTest { 
                    Settings.Global.WIFI_SUPPLICANT_SCAN_INTERVAL_MS,

                    Settings.Global.WIFI_SUSPEND_OPTIMIZATIONS_ENABLED,

                    Settings.Global.WIFI_VERBOSE_LOGGING_ENABLED,

                    Settings.Global.WIFI_WAKEUP_AVAILABLE,

                    Settings.Global.WIFI_WATCHDOG_ON,

                    Settings.Global.WIMAX_NETWORKS_AVAILABLE_NOTIFICATION_ON,

                    Settings.Global.WINDOW_ANIMATION_SCALE,