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

Commit 1b028965 authored by Roshan Pius's avatar Roshan Pius Committed by Android (Google) Code Review
Browse files

Merge changes from topics "auto_wake_toggle_api", "network_rec_enabled" 

* changes:
  WifiManager: Add API for auto wakeup feature toggle
  Settings.Global: Unmark NETWORK_RECOMMENDATIONS_ENABLED as @SystemApi
parents 70cef089 9acc2db5

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -31281,6 +31281,7 @@ package android.net.wifi { 
    method public int getWifiState();

    method public boolean is5GHzBandSupported();

    method public boolean is6GHzBandSupported();

    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isAutoWakeupEnabled();

    method @Deprecated public boolean isDeviceToApRttSupported();

    method public boolean isEasyConnectSupported();

    method public boolean isEnhancedOpenSupported();

api/system-current.txt

+2 −2
Original line number Diff line number Diff line
@@ -7714,6 +7714,7 @@ package android.net.wifi { 
    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public byte[] retrieveBackupData();

    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public byte[] retrieveSoftApBackupData();

    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_STACK}) public void save(@NonNull android.net.wifi.WifiConfiguration, @Nullable android.net.wifi.WifiManager.ActionListener);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setAutoWakeupEnabled(boolean);

    method @RequiresPermission(android.Manifest.permission.WIFI_SET_DEVICE_MOBILITY_STATE) public void setDeviceMobilityState(int);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMacRandomizationSettingPasspointEnabled(@NonNull String, boolean);

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public void setMeteredOverridePasspoint(@NonNull String, int);
@@ -9693,7 +9694,6 @@ package android.provider { 
    field public static final String EUICC_UNSUPPORTED_COUNTRIES = "euicc_unsupported_countries";

    field public static final String INSTALL_CARRIER_APP_NOTIFICATION_PERSISTENT = "install_carrier_app_notification_persistent";

    field public static final String INSTALL_CARRIER_APP_NOTIFICATION_SLEEP_MILLIS = "install_carrier_app_notification_sleep_millis";

    field public static final String NETWORK_RECOMMENDATIONS_ENABLED = "network_recommendations_enabled";

    field public static final String OTA_DISABLE_AUTOMATIC_UPDATE = "ota_disable_automatic_update";

    field public static final String REQUIRE_PASSWORD_TO_DECRYPT = "require_password_to_decrypt";

    field public static final String SOFT_AP_TIMEOUT_ENABLED = "soft_ap_timeout_enabled";
@@ -9708,7 +9708,7 @@ package android.provider { 
    field public static final String WIFI_SCAN_THROTTLE_ENABLED = "wifi_scan_throttle_enabled";

    field public static final String WIFI_SCORE_PARAMS = "wifi_score_params";

    field public static final String WIFI_VERBOSE_LOGGING_ENABLED = "wifi_verbose_logging_enabled";

    field public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled";

    field @Deprecated public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled";

  }















  public static final class Settings.Secure extends android.provider.Settings.NameValueTable {

























core/java/android/provider/Settings.java



+2
−1




























Original line number
Diff line number
Diff line








@@ -10207,7 +10207,9 @@ public final class Settings {













         *















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















         * @hide













         * @deprecated Use {@link WifiManager#isAutoWakeupEnabled()} instead.















         */













        @Deprecated















        @SystemApi















        public static final String WIFI_WAKEUP_ENABLED = "wifi_wakeup_enabled";
























@@ -10243,7 +10245,6 @@ public final class Settings {













         * enabled state.















         * @hide















         */













        @SystemApi















        public static final String NETWORK_RECOMMENDATIONS_ENABLED =















                "network_recommendations_enabled";















































wifi/java/android/net/wifi/IWifiManager.aidl



+4
−0




























Original line number
Diff line number
Diff line








@@ -272,4 +272,8 @@ interface IWifiManager













    boolean isScanThrottleEnabled();































    Map getAllMatchingPasspointProfilesForScanResults(in List<ScanResult> scanResult);



























    void setAutoWakeupEnabled(boolean enable);



























    boolean isAutoWakeupEnabled();















}
























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



+46
−0




























Original line number
Diff line number
Diff line








@@ -6163,4 +6163,50 @@ public class WifiManager {













            throw e.rethrowFromSystemServer();















        }















    }



























    /**













     * Enable/disable wifi auto wakeup feature.













     *













     * <p>













     * The feature is described in













     * <a href="Wi-Fi Turn on automatically">













     * https://source.android.com/devices/tech/connect/wifi-infrastructure













     * #turn_on_wi-fi_automatically













     * </a>













     *













     * @param enable true to enable, false to disable.













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)













    public void setAutoWakeupEnabled(boolean enable) {













        try {













            mService.setAutoWakeupEnabled(enable);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**













     * Get the persisted Wi-Fi auto wakeup feature state. Defaults to false, unless changed by the













     * user via Settings.













     *













     * <p>













     * The feature is described in













     * <a href="Wi-Fi Turn on automatically">













     * https://source.android.com/devices/tech/connect/wifi-infrastructure













     * #turn_on_wi-fi_automatically













     * </a>













     *













     * @return true to indicate that wakeup feature is enabled, false to indicate that wakeup













     * feature is disabled.













     */













    @RequiresPermission(ACCESS_WIFI_STATE)













    public boolean isAutoWakeupEnabled() {













        try {













            return mService.isAutoWakeupEnabled();













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }















}