drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Release wakelock after use" into honeycomb-mr2

Browse Source
This commit is contained in:
Irfan Sheriff
2011-06-21 19:17:27 -07:00
committed by Android (Google) Code Review
parent f5c6236289 cd672ebf29
commit ecce539f3d
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/net/DhcpStateMachine.java
View File

@ -117,13 +117,14 @@ public class DhcpStateMachine extends HierarchicalStateMachine {
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 HierarchicalStateMachine {
switch (message.what) {
case CMD_RENEW_DHCP:
Log.e(TAG, "Error! Failed to handle a DHCP renewal on " + mInterfaceName);
mDhcpRenewWakeLock.release();
break;
case HSM_QUIT_CMD:
mContext.unregisterReceiver(mBroadcastReceiver);
@ -268,10 +270,12 @@ public class DhcpStateMachine extends HierarchicalStateMachine {
/* 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 HierarchicalStateMachine {
}
return retValue;
}
@Override
public void exit() {
mDhcpRenewWakeLock.release();
}
}
private boolean runDhcp(DhcpAction dhcpAction) {