Merge "initial tuning" (150bfcd7) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -132,5 +132,13 @@ interface IWifiManager
		void enableVerboseLogging(int verbose);

		int getVerboseLoggingLevel();

		int getAggressiveHandover();

		void enableAggressiveHandover(int enabled);

		int getAllowScansWithTraffic();

		void setAllowScansWithTraffic(int enabled);
		}

+6 −2

Original line number	Diff line number	Diff line
		@@ -376,7 +376,7 @@ public class WifiConfiguration implements Parcelable {
		public static int LOW_RSSI_24 = -75;

		/ @hide /
		public static int BAD_RSSI_24 = -85;
		public static int BAD_RSSI_24 = -87;

		/ @hide /
		public static int GOOD_RSSI_5 = -55;
		@@ -394,7 +394,7 @@ public class WifiConfiguration implements Parcelable {
		public static int UNWANTED_BLACKLIST_HARD_BUMP = 8;

		/ @hide /
		public static int UNBLACKLIST_THRESHOLD_24_SOFT = -75;
		public static int UNBLACKLIST_THRESHOLD_24_SOFT = -77;

		/ @hide /
		public static int UNBLACKLIST_THRESHOLD_24_HARD = -68;
		@@ -415,6 +415,10 @@ public class WifiConfiguration implements Parcelable {
		* 5GHz band is prefered over 2.4 if the 5GHz RSSI is higher than this threshold **/
		public static int A_BAND_PREFERENCE_RSSI_THRESHOLD = -65;

		/** @hide
		* 5GHz band is penalized if the 5GHz RSSI is lower than this threshold **/
		public static int G_BAND_PREFERENCE_RSSI_THRESHOLD = -75;

		/**
		* @hide
		* A summary of the RSSI and Band status for that configuration

+7 −0

Original line number	Diff line number	Diff line
		@@ -131,6 +131,11 @@ public class WifiInfo implements Parcelable {
		*/
		public int badRssiCount;

		/**
		* @hide
		*/
		public int linkStuckCount;

		/**
		* @hide
		*/
		@@ -237,6 +242,7 @@ public class WifiInfo implements Parcelable {
		txRetriesRate = 0;
		lowRssiCount = 0;
		badRssiCount = 0;
		linkStuckCount = 0;
		score = 0;
		}

		@@ -267,6 +273,7 @@ public class WifiInfo implements Parcelable {
		score = source.score;
		badRssiCount = source.badRssiCount;
		lowRssiCount = source.lowRssiCount;
		linkStuckCount = source.linkStuckCount;
		}
		}

+49 −1

Original line number	Diff line number	Diff line
		@@ -2226,7 +2226,6 @@ public class WifiManager {
		}
		}


		/**
		* Set wifi verbose log. Called from developer settings.
		* @hide
		@@ -2251,4 +2250,53 @@ public class WifiManager {
		return 0;
		}
		}

		/**
		* Set wifi Aggressive Handover. Called from developer settings.
		* @hide
		*/
		public void enableAggressiveHandover(int enabled) {
		try {
		mService.enableAggressiveHandover(enabled);
		} catch (RemoteException e) {

		}
		}

		/**
		* Get the WiFi Handover aggressiveness.This is used by settings
		* to decide what to show within the picker.
		* @hide
		*/
		public int getAggressiveHandover() {
		try {
		return mService.getAggressiveHandover();
		} catch (RemoteException e) {
		return 0;
		}
		}

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

		}
		}

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