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

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

Merge changes from topics "wifi_oem_migration", "wifi_scan_throttle_api" 

* changes:
  WifiOemMigrationHook: Rename class & methods to be more generic
  WifiManager: Add API for scan throttling
parents 57c5ec6a 0ebf6f17

api/current.txt

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

    method public boolean isPreferredNetworkOffloadSupported();

    method @Deprecated public boolean isScanAlwaysAvailable();

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

    method public boolean isStaApConcurrencySupported();

    method public boolean isTdlsSupported();

    method public boolean isWapiSupported();

api/system-current.txt

+10 −9
Original line number Diff line number Diff line
@@ -7693,6 +7693,7 @@ package android.net.wifi { 
    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);

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

    method @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS) public boolean setSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);

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

    method @Deprecated @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean setWifiApConfiguration(android.net.wifi.WifiConfiguration);
@@ -7837,23 +7838,23 @@ package android.net.wifi { 
    method @NonNull @RequiresPermission(android.Manifest.permission.NETWORK_CARRIER_PROVISIONING) public android.net.wifi.WifiNetworkSuggestion.Builder setCarrierId(int);

  }













  public final class WifiOemConfigStoreMigrationHook {













    method @Nullable public static android.net.wifi.WifiOemConfigStoreMigrationHook.MigrationData load();













  public final class WifiOemMigrationHook {













    method @Nullable public static android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData loadFromConfigStore();















  }



























  public static final class WifiOemConfigStoreMigrationHook.MigrationData implements android.os.Parcelable {













  public static final class WifiOemMigrationHook.ConfigStoreMigrationData implements android.os.Parcelable {















    method public int describeContents();















    method @Nullable public java.util.List<android.net.wifi.WifiConfiguration> getUserSavedNetworkConfigurations();















    method @Nullable public android.net.wifi.SoftApConfiguration getUserSoftApConfiguration();















    method public void writeToParcel(@NonNull android.os.Parcel, int);













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiOemConfigStoreMigrationHook.MigrationData> CREATOR;













    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData> CREATOR;















  }



























  public static final class WifiOemConfigStoreMigrationHook.MigrationData.Builder {













    ctor public WifiOemConfigStoreMigrationHook.MigrationData.Builder();













    method @NonNull public android.net.wifi.WifiOemConfigStoreMigrationHook.MigrationData build();













    method @NonNull public android.net.wifi.WifiOemConfigStoreMigrationHook.MigrationData.Builder setUserSavedNetworkConfigurations(@NonNull java.util.List<android.net.wifi.WifiConfiguration>);













    method @NonNull public android.net.wifi.WifiOemConfigStoreMigrationHook.MigrationData.Builder setUserSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);













  public static final class WifiOemMigrationHook.ConfigStoreMigrationData.Builder {













    ctor public WifiOemMigrationHook.ConfigStoreMigrationData.Builder();













    method @NonNull public android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData build();













    method @NonNull public android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData.Builder setUserSavedNetworkConfigurations(@NonNull java.util.List<android.net.wifi.WifiConfiguration>);













    method @NonNull public android.net.wifi.WifiOemMigrationHook.ConfigStoreMigrationData.Builder setUserSoftApConfiguration(@NonNull android.net.wifi.SoftApConfiguration);















  }





























  public class WifiScanner {

























wifi/Android.bp



+1
−1




























Original line number
Diff line number
Diff line








@@ -47,7 +47,7 @@ filegroup {













        // framework-wifi.jar. This is not a good idea, should move WifiNetworkScoreCache















        // to a separate package.















        "java/android/net/wifi/WifiNetworkScoreCache.java",













        "java/android/net/wifi/WifiOemConfigStoreMigrationHook.java",













        "java/android/net/wifi/WifiOemMigrationHook.java",















        "java/android/net/wifi/wificond/*.java",















        ":libwificond_ipc_aidl",















    ],

































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



+4
−0




























Original line number
Diff line number
Diff line








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













     * Return the Map of {@link WifiNetworkSuggestion} and the list of <ScanResult>















     */















    Map getMatchingScanResults(in List<WifiNetworkSuggestion> networkSuggestions, in List<ScanResult> scanResults, String callingPackage, String callingFeatureId);



























    void setScanThrottleEnabled(boolean enable);



























    boolean isScanThrottleEnabled();















}
























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



+44
−0




























Original line number
Diff line number
Diff line








@@ -6118,4 +6118,48 @@ public class WifiManager {













            throw e.rethrowFromSystemServer();















        }















    }



























    /**













     * Enable/disable wifi scan throttling from 3rd party apps.













     *













     * <p>













     * The throttling limits for apps are described in













     * <a href="Wi-Fi Scan Throttling">













     * https://developer.android.com/guide/topics/connectivity/wifi-scan#wifi-scan-throttling</a>













     * </p>













     *













     * @param enable true to allow scan throttling, false to disallow scan throttling.













     * @hide













     */













    @SystemApi













    @RequiresPermission(android.Manifest.permission.NETWORK_SETTINGS)













    public void setScanThrottleEnabled(boolean enable) {













        try {













            mService.setScanThrottleEnabled(enable);













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }



























    /**













     * Get the persisted Wi-Fi scan throttle state. Defaults to true, unless changed by the user via













     * Developer options.













     *













     * <p>













     * The throttling limits for apps are described in













     * <a href="Wi-Fi Scan Throttling">













     * https://developer.android.com/guide/topics/connectivity/wifi-scan#wifi-scan-throttling</a>













     * </p>













     *













     * @return true to indicate that scan throttling is enabled, false to indicate that scan













     * throttling is disabled.













     */













    @RequiresPermission(ACCESS_WIFI_STATE)













    public boolean isScanThrottleEnabled() {













        try {













            return mService.isScanThrottleEnabled();













        } catch (RemoteException e) {













            throw e.rethrowFromSystemServer();













        }













    }















}