Merge "hal based pno and lazy roam implementation" into mnc-dev (7e11579b) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+10 −4

Original line number	Diff line number	Diff line
		@@ -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>

core/res/res/values/symbols.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -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" />

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

+8 −5

Original line number	Diff line number	Diff line
		@@ -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();

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

+51 −3

Original line number	Diff line number	Diff line
		@@ -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;
		}
		}