diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-06-22 11:21:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-22 11:21:12 -0700 |
| commit | 1cc0fa416f195732cc7c04cebfaabe7f3fe994c7 (patch) | |
| tree | 4dbda8f85609406db54bd0b2ba2a43d4e095be2e /core/java | |
| parent | ecf161437e4a2f2e0493f303119e8b2f090739eb (diff) | |
| parent | db45e0bdd02c2b9416b89999422561929feb5cc0 (diff) | |
am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit 'db45e0bdd02c2b9416b89999422561929feb5cc0':
Release wakelock after use
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/DhcpStateMachine.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/net/DhcpStateMachine.java b/core/java/android/net/DhcpStateMachine.java index c49c019b50f9..445b2f77b06c 100644 --- a/core/java/android/net/DhcpStateMachine.java +++ b/core/java/android/net/DhcpStateMachine.java @@ -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) { |