am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2 (756f25fc) · Commits · e / os / android_frameworks_base

core/java/android/net/DhcpStateMachine.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -117,13 +117,14 @@ public class DhcpStateMachine extends StateMachine {

		PowerManager powerManager = (PowerManager)mContext.getSystemService(Context.POWER_SERVICE);
		mDhcpRenewWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_TAG);
		mDhcpRenewWakeLock.setReferenceCounted(false);

		mBroadcastReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		//DHCP renew
		if (DBG) Log.d(TAG, "Sending a DHCP renewal " + this);
		//acquire a 40s wakelock to finish DHCP renewal
		//Lock released after 40s in worst case scenario
		mDhcpRenewWakeLock.acquire(40000);
		sendMessage(CMD_RENEW_DHCP);
		}
		@@ -166,6 +167,7 @@ public class DhcpStateMachine extends StateMachine {
		switch (message.what) {
		case CMD_RENEW_DHCP:
		Log.e(TAG, "Error! Failed to handle a DHCP renewal on " + mInterfaceName);
		mDhcpRenewWakeLock.release();
		break;
		case SM_QUIT_CMD:
		mContext.unregisterReceiver(mBroadcastReceiver);
		@@ -268,10 +270,12 @@ public class DhcpStateMachine extends StateMachine {
		/* Notify controller before starting DHCP */
		mController.sendMessage(CMD_PRE_DHCP_ACTION);
		transitionTo(mWaitBeforeRenewalState);
		//mDhcpRenewWakeLock is released in WaitBeforeRenewalState
		} else {
		if (!runDhcp(DhcpAction.RENEW)) {
		transitionTo(mStoppedState);
		}
		mDhcpRenewWakeLock.release();
		}
		break;
		case CMD_START_DHCP:
		@@ -318,6 +322,10 @@ public class DhcpStateMachine extends StateMachine {
		}
		return retValue;
		}
		@Override
		public void exit() {
		mDhcpRenewWakeLock.release();
		}
		}

		private boolean runDhcp(DhcpAction dhcpAction) {