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

Commit 3e07a89b authored by Christopher Tate's avatar Christopher Tate
Browse files

Fix build & preserve DHCP scheduling as-is 

Change-Id: I4063b18532c476280f343658bf3641495e526ed4
parent b4be6948

core/java/android/net/DhcpStateMachine.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -374,7 +374,7 @@ public class DhcpStateMachine extends StateMachine { 
                //Do it a bit earlier than half the lease duration time

                //Do it a bit earlier than half the lease duration time

                //to beat the native DHCP client and avoid extra packets

                //to beat the native DHCP client and avoid extra packets

                //48% for one hour lease time = 29 minutes

                //48% for one hour lease time = 29 minutes

                mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME_WAKEUP,

                        SystemClock.elapsedRealtime() +

                        SystemClock.elapsedRealtime() +

                        leaseDuration * 480, //in milliseconds

                        leaseDuration * 480, //in milliseconds

                        mDhcpRenewalIntent);

                        mDhcpRenewalIntent);

services/tests/servicestests/src/com/android/server/NetworkStatsServiceTest.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -878,8 +878,7 @@ public class NetworkStatsServiceTest extends AndroidTestCase { 
        mAlarmManager.remove(isA(PendingIntent.class));

        mAlarmManager.remove(isA(PendingIntent.class));

        expectLastCall().anyTimes();

        expectLastCall().anyTimes();





        mAlarmManager.setInexactRepeating(

        mAlarmManager.set(eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), isA(PendingIntent.class), false);

                eq(AlarmManager.ELAPSED_REALTIME), anyLong(), anyLong(), isA(PendingIntent.class));

        expectLastCall().atLeastOnce();

        expectLastCall().atLeastOnce();





        mNetManager.setGlobalAlert(anyLong());

        mNetManager.setGlobalAlert(anyLong());