Merge "Control suspend optimizations from framework" (8a34718d) · Commits · e / os / android_frameworks_base

services/java/com/android/server/WifiService.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -101,9 +101,6 @@ public class WifiService extends IWifiManager.Stub {
		private boolean mEmergencyCallbackMode = false;
		private int mPluggedType;

		/* Chipset supports background scan */
		private final boolean mBackgroundScanSupported;

		private final LockList mLocks = new LockList();
		// some wifi lock statistics
		private int mFullHighPerfLocksAcquired;
		@@ -435,9 +432,6 @@ public class WifiService extends IWifiManager.Stub {
		Settings.Secure.WIFI_NETWORKS_AVAILABLE_REPEAT_DELAY, 900) * 1000l;
		mNotificationEnabledSettingObserver = new NotificationEnabledSettingObserver(new Handler());
		mNotificationEnabledSettingObserver.register();

		mBackgroundScanSupported = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_wifi_background_scan_support);
		}

		/**
		@@ -956,11 +950,6 @@ public class WifiService extends IWifiManager.Stub {
		mAlarmManager.cancel(mIdleIntent);
		mScreenOff = false;
		evaluateTrafficStatsPolling();
		mWifiStateMachine.enableRssiPolling(true);
		if (mBackgroundScanSupported) {
		mWifiStateMachine.enableBackgroundScanCommand(false);
		}
		mWifiStateMachine.enableAllNetworks();
		setDeviceIdleAndUpdateWifi(false);
		} else if (action.equals(Intent.ACTION_SCREEN_OFF)) {
		if (DBG) {
		@@ -968,10 +957,6 @@ public class WifiService extends IWifiManager.Stub {
		}
		mScreenOff = true;
		evaluateTrafficStatsPolling();
		mWifiStateMachine.enableRssiPolling(false);
		if (mBackgroundScanSupported) {
		mWifiStateMachine.enableBackgroundScanCommand(true);
		}
		/*
		* Set a timer to put Wi-Fi to sleep, but only if the screen is off
		* AND the "stay on while plugged in" setting doesn't match the

wifi/java/android/net/wifi/WifiNative.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -354,9 +354,9 @@ public class WifiNative {

		public boolean setSuspendOptimizations(boolean enabled) {
		if (enabled) {
		return doBooleanCommand("DRIVER SETSUSPENDOPT 0");
		return doBooleanCommand("DRIVER SETSUSPENDMODE 1");
		} else {
		return doBooleanCommand("DRIVER SETSUSPENDOPT 1");
		return doBooleanCommand("DRIVER SETSUSPENDMODE 0");
		}
		}

wifi/java/android/net/wifi/WifiStateMachine.java

+72 −28

Original line number	Diff line number	Diff line
		@@ -127,6 +127,9 @@ public class WifiStateMachine extends StateMachine {
		private static final int SCAN_RESULT_CACHE_SIZE = 80;
		private final LruCache<String, ScanResult> mScanResultCache;

		/* Chipset supports background scan */
		private final boolean mBackgroundScanSupported;

		private String mInterfaceName;
		/* Tethering interface could be seperate from wlan interface */
		private String mTetherInterfaceName;
		@@ -142,9 +145,15 @@ public class WifiStateMachine extends StateMachine {
		private boolean mScanResultIsPending = false;
		/* Tracks if the current scan settings are active */
		private boolean mSetScanActive = false;
		/* High perf mode is true if an app has held a high perf Wifi Lock */
		private boolean mHighPerfMode = false;

		private boolean mBluetoothConnectionActive = false;

		private BroadcastReceiver mScreenReceiver;
		private IntentFilter mScreenFilter;
		private PowerManager.WakeLock mSuspendWakeLock;

		/**
		* Interval in milliseconds between polling for RSSI
		* and linkspeed information
		@@ -320,6 +329,10 @@ public class WifiStateMachine extends StateMachine {
		static final int CMD_START_PACKET_FILTERING = BASE + 84;
		/* Clear packet filter */
		static final int CMD_STOP_PACKET_FILTERING = BASE + 85;
		/* Set suspend mode optimizations in the driver */
		static final int CMD_SET_SUSPEND_OPTIMIZATIONS = BASE + 86;
		/* Clear suspend mode optimizations in the driver */
		static final int CMD_CLEAR_SUSPEND_OPTIMIZATIONS = BASE + 87;

		/* arg1 values to CMD_STOP_PACKET_FILTERING and CMD_START_PACKET_FILTERING */
		static final int MULTICAST_V6 = 1;
		@@ -566,6 +579,9 @@ public class WifiStateMachine extends StateMachine {
		mDriverStopDelayMs = mContext.getResources().getInteger(
		com.android.internal.R.integer.config_wifi_driver_stop_delay);

		mBackgroundScanSupported = mContext.getResources().getBoolean(
		com.android.internal.R.bool.config_wifi_background_scan_support);

		mContext.registerReceiver(
		new BroadcastReceiver() {
		@Override
		@@ -587,11 +603,41 @@ public class WifiStateMachine extends StateMachine {
		},
		new IntentFilter(ACTION_START_SCAN));

		mScreenFilter = new IntentFilter();
		mScreenFilter.addAction(Intent.ACTION_SCREEN_ON);
		mScreenFilter.addAction(Intent.ACTION_SCREEN_OFF);
		mScreenReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		String action = intent.getAction();

		if (action.equals(Intent.ACTION_SCREEN_ON)) {
		enableRssiPolling(true);
		if (mBackgroundScanSupported) {
		enableBackgroundScanCommand(false);
		}
		enableAllNetworks();
		sendMessage(CMD_CLEAR_SUSPEND_OPTIMIZATIONS);
		} else if (action.equals(Intent.ACTION_SCREEN_OFF)) {
		enableRssiPolling(false);
		if (mBackgroundScanSupported) {
		enableBackgroundScanCommand(true);
		}
		//Allow 2s for suspend optimizations to be set
		mSuspendWakeLock.acquire(2000);
		sendMessage(CMD_SET_SUSPEND_OPTIMIZATIONS);
		}
		}
		};

		mScanResultCache = new LruCache<String, ScanResult>(SCAN_RESULT_CACHE_SIZE);

		PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
		mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);

		mSuspendWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "WifiSuspend");
		mSuspendWakeLock.setReferenceCounted(false);

		addState(mDefaultState);
		addState(mInitialState, mDefaultState);
		addState(mDriverUnloadingState, mDefaultState);
		@@ -1436,21 +1482,6 @@ public class WifiStateMachine extends StateMachine {
		}
		}

		private void setHighPerfModeEnabledNative(boolean enable) {
		if(!mWifiNative.setSuspendOptimizations(!enable)) {
		loge("set suspend optimizations failed!");
		}
		if (enable) {
		if (!mWifiNative.setPowerMode(POWER_MODE_ACTIVE)) {
		loge("set power mode active failed!");
		}
		} else {
		if (!mWifiNative.setPowerMode(POWER_MODE_AUTO)) {
		loge("set power mode auto failed!");
		}
		}
		}

		private void configureLinkProperties() {
		if (mWifiConfigStore.isUsingStaticIp(mLastNetworkId)) {
		mLinkProperties = mWifiConfigStore.getLinkProperties(mLastNetworkId);
		@@ -1781,6 +1812,9 @@ public class WifiStateMachine extends StateMachine {
		case CMD_ENABLE_BACKGROUND_SCAN:
		mEnableBackgroundScan = (message.arg1 == 1);
		break;
		case CMD_SET_HIGH_PERF_MODE:
		mHighPerfMode = (message.arg1 == 1);
		break;
		/* Discard */
		case CMD_LOAD_DRIVER:
		case CMD_UNLOAD_DRIVER:
		@@ -1812,7 +1846,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_CLEAR_BLACKLIST:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_RSSI_POLL:
		@@ -1826,6 +1859,10 @@ public class WifiStateMachine extends StateMachine {
		case CMD_RESPONSE_AP_CONFIG:
		case WifiWatchdogStateMachine.POOR_LINK_DETECTED:
		case WifiWatchdogStateMachine.GOOD_LINK_DETECTED:
		case CMD_CLEAR_SUSPEND_OPTIMIZATIONS:
		break;
		case CMD_SET_SUSPEND_OPTIMIZATIONS:
		mSuspendWakeLock.release();
		break;
		case WifiMonitor.DRIVER_HUNG_EVENT:
		setWifiEnabled(false);
		@@ -1969,7 +2006,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -2103,7 +2139,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -2206,7 +2241,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -2416,7 +2450,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -2459,7 +2492,6 @@ public class WifiStateMachine extends StateMachine {
		case WifiMonitor.AUTHENTICATION_FAILURE_EVENT:
		case WifiMonitor.WPS_OVERLAP_EVENT:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -2526,6 +2558,8 @@ public class WifiStateMachine extends StateMachine {
		}

		if (mP2pSupported) mWifiP2pChannel.sendMessage(WifiStateMachine.CMD_ENABLE_P2P);

		mContext.registerReceiver(mScreenReceiver, mScreenFilter);
		}
		@Override
		public boolean processMessage(Message message) {
		@@ -2548,9 +2582,6 @@ public class WifiStateMachine extends StateMachine {
		}
		mScanResultIsPending = true;
		break;
		case CMD_SET_HIGH_PERF_MODE:
		setHighPerfModeEnabledNative(message.arg1 == 1);
		break;
		case CMD_SET_COUNTRY_CODE:
		String country = (String) message.obj;
		if (DBG) log("set country code " + country);
		@@ -2631,6 +2662,22 @@ public class WifiStateMachine extends StateMachine {
		loge("Illegal arugments to CMD_STOP_PACKET_FILTERING");
		}
		break;
		case CMD_SET_SUSPEND_OPTIMIZATIONS:
		if (!mHighPerfMode) {
		mWifiNative.setSuspendOptimizations(true);
		}
		mSuspendWakeLock.release();
		break;
		case CMD_CLEAR_SUSPEND_OPTIMIZATIONS:
		mWifiNative.setSuspendOptimizations(false);
		break;
		case CMD_SET_HIGH_PERF_MODE:
		mHighPerfMode = (message.arg1 == 1);
		if (mHighPerfMode) {
		//Disable any suspend optimizations
		mWifiNative.setSuspendOptimizations(false);
		}
		break;
		default:
		return NOT_HANDLED;
		}
		@@ -2647,6 +2694,7 @@ public class WifiStateMachine extends StateMachine {
		mScanResults = null;

		if (mP2pSupported) mWifiP2pChannel.sendMessage(WifiStateMachine.CMD_DISABLE_P2P);
		mContext.unregisterReceiver(mScreenReceiver);
		}
		}

		@@ -2670,7 +2718,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_START_DRIVER:
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -3430,7 +3477,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -3543,7 +3589,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING:
		@@ -3638,7 +3683,6 @@ public class WifiStateMachine extends StateMachine {
		case CMD_STOP_DRIVER:
		case CMD_SET_SCAN_MODE:
		case CMD_SET_SCAN_TYPE:
		case CMD_SET_HIGH_PERF_MODE:
		case CMD_SET_COUNTRY_CODE:
		case CMD_SET_FREQUENCY_BAND:
		case CMD_START_PACKET_FILTERING: