Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd672ebf authored by Irfan Sheriff's avatar Irfan Sheriff
Browse files

Release wakelock after use 

DHCP renewal can finish pretty quick most times and holding
a timed wakelock wastes battery.

Hold a non-reference counted lock and release it immediate
while having the safety of a 40s release

Bug: 4575773
Change-Id: I49d2e8c27b2723690aef26417c4b9a145843a401
parent 41b35884

core/java/android/net/DhcpStateMachine.java

+9 −1
Original line number Diff line number Diff line
@@ -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) {