diff options
| -rwxr-xr-x | core/res/res/values/config.xml | 14 | ||||
| -rwxr-xr-x | core/res/res/values/symbols.xml | 6 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/IWifiManager.aidl | 13 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiManager.java | 54 |
4 files changed, 73 insertions, 14 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 84e4ca9..31e0f63 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -423,11 +423,17 @@ point on the move. A value of 0 means no periodic scans will be used in the framework. --> <integer translatable="false" name="config_wifi_framework_scan_interval">300000</integer> - <!-- Integer indicating disconnect mode scan interval in milliseconds --> - <integer translatable="false" name="config_wifi_disconnected_scan_interval">15000</integer> + <!-- Integer indicating disconnect mode short scan interval in milliseconds --> + <integer translatable="false" name="config_wifi_disconnected_short_scan_interval">15000</integer> - <!-- Integer indicating associated partial scan interval in milliseconds --> - <integer translatable="false" name="config_wifi_framework_associated_scan_interval">20000</integer> + <!-- Integer indicating disconnect mode long scan interval in milliseconds --> + <integer translatable="false" name="config_wifi_disconnected_long_scan_interval">120000</integer> + + <!-- Integer indicating associated partial scan short interval in milliseconds --> + <integer translatable="false" name="config_wifi_associated_short_scan_interval">20000</integer> + + <!-- Integer indicating associated partial scan long interval in milliseconds --> + <integer translatable="false" name="config_wifi_associated_long_scan_interval">180000</integer> <!-- Integer indicating associated full scan backoff, representing a fraction: xx/8 --> <integer translatable="false" name="config_wifi_framework_associated_full_scan_backoff">12</integer> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 64e3964..ef505f8 100755 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -310,7 +310,10 @@ <java-symbol type="integer" name="config_wifi_framework_current_association_hysteresis_low" /> <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_threshold" /> <java-symbol type="integer" name="config_wifi_framework_5GHz_preference_penalty_factor" /> - <java-symbol type="integer" name="config_wifi_framework_associated_scan_interval" /> + <java-symbol type="integer" name="config_wifi_disconnected_short_scan_interval" /> + <java-symbol type="integer" name="config_wifi_disconnected_long_scan_interval" /> + <java-symbol type="integer" name="config_wifi_associated_short_scan_interval" /> + <java-symbol type="integer" name="config_wifi_associated_long_scan_interval" /> <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_backoff" /> <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_max_interval" /> <java-symbol type="integer" name="config_wifi_framework_associated_full_scan_max_total_dwell_time" /> @@ -380,7 +383,6 @@ <java-symbol type="integer" name="config_shortPressOnSleepBehavior" /> <java-symbol type="integer" name="config_wifi_framework_scan_interval" /> <java-symbol type="integer" name="config_wifi_supplicant_scan_interval" /> - <java-symbol type="integer" name="config_wifi_disconnected_scan_interval" /> <java-symbol type="integer" name="config_wifi_scan_interval_p2p_connected" /> <java-symbol type="bool" name="config_wifi_hal_pno_enable" /> <java-symbol type="integer" name="db_connection_pool_size" /> diff --git a/wifi/java/android/net/wifi/IWifiManager.aidl b/wifi/java/android/net/wifi/IWifiManager.aidl index 00cdc71..b2af044 100644 --- a/wifi/java/android/net/wifi/IWifiManager.aidl +++ b/wifi/java/android/net/wifi/IWifiManager.aidl @@ -152,17 +152,20 @@ interface IWifiManager int getVerboseLoggingLevel(); - int getAggressiveHandover(); - void enableAggressiveHandover(int enabled); + int getAggressiveHandover(); + void setAllowScansWithTraffic(int enabled); int getAllowScansWithTraffic(); - void setAllowScansWithTraffic(int enabled); + void setAllowScansWhileAssociated(int enabled); + int getAllowScansWhileAssociated(); - boolean getAllowScansWhileAssociated(); + void setAllowNetworkSwitchingWhileAssociated(int enabled); + int getAllowNetworkSwitchingWhileAssociated(); - void setAllowScansWhileAssociated(boolean enabled); + void setHalBasedAutojoinOffload(int enabled); + int getHalBasedAutojoinOffload(); WifiConnectionStatistics getConnectionStatistics(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index a2b1858..f2c2a28 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -2773,7 +2773,7 @@ public class WifiManager { * Set setting for allowing Scans when infrastructure is associated * @hide */ - public void setAllowScansWhileAssociated(boolean enabled) { + public void setAllowScansWhileAssociated(int enabled) { try { mService.setAllowScansWhileAssociated(enabled); } catch (RemoteException e) { @@ -2785,12 +2785,12 @@ public class WifiManager { * Get setting for allowing Scans when infrastructure is associated * @hide */ - public boolean getAllowScansWhileAssociated() { + public int getAllowScansWhileAssociated() { try { return mService.getAllowScansWhileAssociated(); } catch (RemoteException e) { } - return false; + return 0; } /** @@ -2817,4 +2817,52 @@ public class WifiManager { return null; } } + + /** + * Set setting for enabling autojoin Offload thru Wifi HAL layer + * @hide + */ + public void setHalBasedAutojoinOffload(int enabled) { + try { + mService.setHalBasedAutojoinOffload(enabled); + } catch (RemoteException e) { + + } + } + + /** + * Get setting for enabling autojoin Offload thru Wifi HAL layer + * @hide + */ + public int getHalBasedAutojoinOffload() { + try { + return mService.getHalBasedAutojoinOffload(); + } catch (RemoteException e) { + } + return 0; + } + + /** + * Set setting for enabling network switching while wifi is associated + * @hide + */ + public void setAllowNetworkSwitchingWhileAssociated(int enabled) { + try { + mService.setAllowNetworkSwitchingWhileAssociated(enabled); + } catch (RemoteException e) { + + } + } + + /** + * Get setting for enabling network switching while wifi is associated + * @hide + */ + public int getAllowNetworkSwitchingWhileAssociated() { + try { + return mService.getAllowNetworkSwitchingWhileAssociated(); + } catch (RemoteException e) { + } + return 0; + } } |