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

Commit 6eb8b3cb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove unused system property setting code"

parents d40c9503 23923c34

src/java/com/android/internal/telephony/NitzStateMachine.java

+0 −8
Original line number Diff line number Diff line
@@ -98,13 +98,6 @@ public class NitzStateMachine { 
            return ignoreNitz != null && ignoreNitz.equals("yes");

        }



        /**

         * Sets the {@code gsm.nitz.time} system property.

         */

        public void setNitzTimeProperty(long timeMillis) {

            SystemProperties.set("gsm.nitz.time", String.valueOf(timeMillis));

        }



        /**

         * Returns the same value as {@link SystemClock#elapsedRealtime()}.

         */
@@ -495,7 +488,6 @@ public class NitzStateMachine { 
    }



    private void saveNitzTime(long time) {

        mDeviceState.setNitzTimeProperty(time);

        mSavedTime = time;

        mSavedAtTime = mDeviceState.elapsedRealtime();

        mNitzUpdatedTime = true;

tests/telephonytests/src/com/android/internal/telephony/NitzStateMachineTest.java

+0 −21
Original line number Diff line number Diff line
@@ -110,8 +110,6 @@ public class NitzStateMachineTest extends TelephonyTest { 
        verifyTimeServiceTimeZoneWasSet(usNitzSignal.getTimeZoneId());

        verifyTimeServiceTimeWasSet(expectedAdjustedCurrentTimeMillis);



        verifyNitzTimePropertyWasSet(expectedAdjustedCurrentTimeMillis);



        assertTrue(mNitzStateMachine.getNitzUpdatedTime());

        assertEquals(usNitzSignal.getNitzData(), mNitzStateMachine.getCachedNitzData());

        assertEquals(usNitzSignal.getTimeZoneId(), mNitzStateMachine.getSavedTimeZoneId());
@@ -145,8 +143,6 @@ public class NitzStateMachineTest extends TelephonyTest { 
        verifyTimeServiceTimeZoneWasNotSet();

        verifyTimeServiceTimeWasSet(expectedAdjustedCurrentTimeMillis);



        verifyNitzTimePropertyWasSet(expectedAdjustedCurrentTimeMillis);



        assertTrue(mNitzStateMachine.getNitzUpdatedTime());

        assertEquals(usNitzSignal.getNitzData(), mNitzStateMachine.getCachedNitzData());

        assertEquals(usNitzSignal.getTimeZoneId(), mNitzStateMachine.getSavedTimeZoneId());
@@ -173,14 +169,9 @@ public class NitzStateMachineTest extends TelephonyTest { 
                usNitzSignal.getNitzData(), usNitzSignal.getReceivedRealtimeMillis());



        // Check resulting state and side effects.

        long expectedAdjustedCurrentTimeMillis =

                usNitzSignal.getAdjustedCurrentTimeMillis(mDeviceState.elapsedRealtime());



        verifyTimeServiceTimeZoneWasSet(usNitzSignal.getTimeZoneId());

        verifyTimeServiceTimeWasNotSet();



        verifyNitzTimePropertyWasSet(expectedAdjustedCurrentTimeMillis);



        assertTrue(mNitzStateMachine.getNitzUpdatedTime());

        assertEquals(usNitzSignal.getNitzData(), mNitzStateMachine.getCachedNitzData());

        assertEquals(usNitzSignal.getTimeZoneId(), mNitzStateMachine.getSavedTimeZoneId());
@@ -207,15 +198,9 @@ public class NitzStateMachineTest extends TelephonyTest { 
        mNitzStateMachine.setTimeAndTimeZoneFromNitz(

                usNitzSignal.getNitzData(), usNitzSignal.getReceivedRealtimeMillis());



        // Check resulting state and side effects.

        long expectedAdjustedCurrentTimeMillis =

                usNitzSignal.getAdjustedCurrentTimeMillis(mDeviceState.elapsedRealtime());



        verifyTimeServiceTimeZoneWasNotSet();

        verifyTimeServiceTimeWasNotSet();



        verifyNitzTimePropertyWasSet(expectedAdjustedCurrentTimeMillis);



        assertTrue(mNitzStateMachine.getNitzUpdatedTime());

        assertEquals(usNitzSignal.getNitzData(), mNitzStateMachine.getCachedNitzData());

        assertEquals(usNitzSignal.getTimeZoneId(), mNitzStateMachine.getSavedTimeZoneId());
@@ -239,12 +224,6 @@ public class NitzStateMachineTest extends TelephonyTest { 
        assertEquals(expectedTimeMillis, (long) timeServiceTimeCaptor.getValue());

    }



    private void verifyNitzTimePropertyWasSet(long expectedTimeMillis) {

        ArgumentCaptor<Long> propertyCaptor = ArgumentCaptor.forClass(Long.TYPE);

        verify(mDeviceState, times(1)).setNitzTimeProperty(propertyCaptor.capture());

        assertEquals(expectedTimeMillis, (long) propertyCaptor.getValue());

    }



    private void incrementSimulatedDeviceClock(int incMillis) {

        long currentElapsedRealtime = mDeviceState.elapsedRealtime();

        when(mDeviceState.elapsedRealtime()).thenReturn(currentElapsedRealtime + incMillis);