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

Commit 41aa516a authored by Neil Fuller's avatar Neil Fuller Committed by Gerrit Code Review
Browse files

Merge "Make time / time zone local logging clearer"

parents ab7ef30e 48d302eb

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

+2 −2
Original line number Diff line number Diff line
@@ -89,8 +89,8 @@ public final class NitzStateMachineImpl implements NitzStateMachine { 
    private boolean mNitzTimeZoneDetectionSuccessful = false;



    // Miscellaneous dependencies and helpers not related to detection state.

    private final LocalLog mTimeLog = new LocalLog(30);

    private final LocalLog mTimeZoneLog = new LocalLog(30);

    private final LocalLog mTimeLog = new LocalLog(30, false /* useLocalTimestamps */);

    private final LocalLog mTimeZoneLog = new LocalLog(30, false /* useLocalTimestamps */);

    private final Phone mPhone;

    private final DeviceState mDeviceState;

    private final TimeServiceHelper mTimeServiceHelper;

src/java/com/android/internal/telephony/nitz/NewTimeServiceHelperImpl.java

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ public final class NewTimeServiceHelperImpl implements NewTimeServiceHelper { 
    private final TimeDetector mTimeDetector;

    private final TimeZoneDetector mTimeZoneDetector;



    private final LocalLog mTimeZoneLog = new LocalLog(30);

    private final LocalLog mTimeLog = new LocalLog(30);

    private final LocalLog mTimeZoneLog = new LocalLog(30, false /* mUseLocalTimestamps */);

    private final LocalLog mTimeLog = new LocalLog(30, false /* mUseLocalTimestamps */);



    /**

     * Records the last time zone suggestion made. Used to avoid sending duplicate suggestions to