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

Commit 5afbd368 authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "Pull out NITZ-related logic into a separate class"

parents 9ff280eb 10bdf3dd

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

+1 −1
Original line number Diff line number Diff line
@@ -359,7 +359,7 @@ public final class MccTable { 
     * @param mcc Mobile Country Code of the SIM or SIM-like entity (build prop on CDMA)

     */

    private static void setTimezoneFromMccIfNeeded(Context context, int mcc) {

        String timezone = SystemProperties.get(ServiceStateTracker.TIMEZONE_PROPERTY);

        String timezone = SystemProperties.get(NitzStateMachine.TIMEZONE_PROPERTY);

        // timezone.equals("GMT") will be true and only true if the timezone was

        // set to a default value by the system server (when starting, system server.

        // sets the persist.sys.timezone to "GMT" if it's not set)."GMT" is not used by

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

0 → 100644
+657 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+67 −549

File changed.

Preview size limit exceeded, changes collapsed.