Merge "Add API to turn OFF "best network selection" feature" into mnc-dev (822f6141) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+0 −3

Original line number	Diff line number	Diff line
		@@ -480,9 +480,6 @@
		<!-- Integer indicating how to handle beacons with uninitialized RSSI value of 0 -->
		<integer translatable="false" name="config_wifi_framework_scan_result_rssi_level_patchup_value">-85</integer>

		<!-- Boolean indicating associated scan are allowed -->
		<bool translatable="false" name="config_wifi_framework_enable_associated_autojoin_scan">true</bool>

		<!-- Boolean indicating associated network selection is allowed -->
		<bool translatable="false" name="config_wifi_framework_enable_associated_network_selection">true</bool>

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,6 @@
		<java-symbol type="bool" name="config_hasRecents" />
		<java-symbol type="bool" name="config_windowShowCircularMask" />
		<java-symbol type="bool" name="config_windowEnableCircularEmulatorDisplayOverlay" />
		<java-symbol type="bool" name="config_wifi_framework_enable_associated_autojoin_scan" />
		<java-symbol type="bool" name="config_wifi_framework_enable_associated_network_selection" />
		<java-symbol type="bool" name="config_wifi_only_link_same_credential_configurations" />
		<java-symbol type="bool" name="config_wifi_enable_disconnection_debounce" />

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

+3 −6

Original line number	Diff line number	Diff line
		@@ -158,15 +158,12 @@ interface IWifiManager
		void setAllowScansWithTraffic(int enabled);
		int getAllowScansWithTraffic();

		void setAllowScansWhileAssociated(int enabled);
		int getAllowScansWhileAssociated();

		void setAllowNetworkSwitchingWhileAssociated(int enabled);
		int getAllowNetworkSwitchingWhileAssociated();

		void setHalBasedAutojoinOffload(int enabled);
		int getHalBasedAutojoinOffload();

		boolean enableAutoJoinWhenAssociated(boolean enabled);
		boolean getEnableAutoJoinWhenAssociated();

		WifiConnectionStatistics getConnectionStatistics();

		void disableEphemeralNetwork(String SSID);

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

+16 −39

Original line number	Diff line number	Diff line
		@@ -2806,30 +2806,6 @@ public class WifiManager {
		}
		}

		/**
		* Set setting for allowing Scans when infrastructure is associated
		* @hide
		*/
		public void setAllowScansWhileAssociated(int enabled) {
		try {
		mService.setAllowScansWhileAssociated(enabled);
		} catch (RemoteException e) {

		}
		}

		/**
		* Get setting for allowing Scans when infrastructure is associated
		* @hide
		*/
		public int getAllowScansWhileAssociated() {
		try {
		return mService.getAllowScansWhileAssociated();
		} catch (RemoteException e) {
		}
		return 0;
		}

		/**
		* Resets all wifi manager settings back to factory defaults.
		*
		@@ -2856,48 +2832,49 @@ public class WifiManager {
		}

		/**
		* Set setting for enabling autojoin Offload thru Wifi HAL layer
		* Framework layer autojoin enable/disable when device is associated
		* this will enable/disable autojoin scan and switch network when connected
		* @return true -- if set successful false -- if set failed
		* @hide
		*/
		public void setHalBasedAutojoinOffload(int enabled) {
		public boolean enableAutoJoinWhenAssociated(boolean enabled) {
		try {
		mService.setHalBasedAutojoinOffload(enabled);
		return mService.enableAutoJoinWhenAssociated(enabled);
		} catch (RemoteException e) {

		return false;
		}
		}

		/**
		* Get setting for enabling autojoin Offload thru Wifi HAL layer
		* Get setting for Framework layer autojoin enable status
		* @hide
		*/
		public int getHalBasedAutojoinOffload() {
		public boolean getEnableAutoJoinWhenAssociated() {
		try {
		return mService.getHalBasedAutojoinOffload();
		return mService.getEnableAutoJoinWhenAssociated();
		} catch (RemoteException e) {
		return false;
		}
		return 0;
		}

		/**
		* Set setting for enabling network switching while wifi is associated
		* Set setting for enabling autojoin Offload thru Wifi HAL layer
		* @hide
		*/
		public void setAllowNetworkSwitchingWhileAssociated(int enabled) {
		public void setHalBasedAutojoinOffload(int enabled) {
		try {
		mService.setAllowNetworkSwitchingWhileAssociated(enabled);
		mService.setHalBasedAutojoinOffload(enabled);
		} catch (RemoteException e) {

		}
		}

		/**
		* Get setting for enabling network switching while wifi is associated
		* Get setting for enabling autojoin Offload thru Wifi HAL layer
		* @hide
		*/
		public int getAllowNetworkSwitchingWhileAssociated() {
		public int getHalBasedAutojoinOffload() {
		try {
		return mService.getAllowNetworkSwitchingWhileAssociated();
		return mService.getHalBasedAutojoinOffload();
		} catch (RemoteException e) {
		}
		return 0;