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

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

Merge "DO NOT MERGE Remove OldNitzStateMachine impl" into qt-qpr1-dev

parents 8fc09eaa 92fc2656

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

+6 −17
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ public final class MccTable { 
    private static void setTimezoneFromMccIfNeeded(Context context, int mcc) {

        // Switch to use the time service helper associated with the NitzStateMachine impl

        // being used. This logic will be removed once the old implementation is removed.

        if (TelephonyComponentFactory.USE_NEW_NITZ_STATE_MACHINE) {

        if (!NewTimeServiceHelper.isTimeZoneSettingInitializedStatic()) {

            String zoneId = defaultTimeZoneForMcc(mcc);

            if (zoneId != null && zoneId.length() > 0) {
@@ -369,16 +368,6 @@ public final class MccTable { 
                Slog.d(LOG_TAG, "timezone set to " + zoneId);

            }

        }

        } else {

            if (!OldTimeServiceHelper.isTimeZoneSettingInitializedStatic()) {

                String zoneId = defaultTimeZoneForMcc(mcc);

                if (zoneId != null && zoneId.length() > 0) {

                    // Set time zone based on MCC

                    OldTimeServiceHelper.setDeviceTimeZoneStatic(context, zoneId);

                    Slog.d(LOG_TAG, "timezone set to " + zoneId);

                }

            }

        }

    }



    /**

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

deleted100644 → 0
+0 −534

File deleted.

Preview size limit exceeded, changes collapsed.

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

deleted100644 → 0
+0 −193

File deleted.

Preview size limit exceeded, changes collapsed.

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

+1 −9
Original line number Diff line number Diff line
@@ -292,19 +292,11 @@ public class TelephonyComponentFactory { 
        return new EmergencyNumberTracker(phone, ci);

    }



    /**

     * Sets the NitzStateMachine implementation to use during implementation. This boolean

     * should be removed once the new implementation is stable.

     */

    static final boolean USE_NEW_NITZ_STATE_MACHINE = true;



    /**

     * Returns a new {@link NitzStateMachine} instance.

     */

    public NitzStateMachine makeNitzStateMachine(GsmCdmaPhone phone) {

        return USE_NEW_NITZ_STATE_MACHINE

                ? new NewNitzStateMachine(phone)

                : new OldNitzStateMachine(phone);

        return new NewNitzStateMachine(phone);

    }



    public SimActivationTracker makeSimActivationTracker(Phone phone) {

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

deleted100644 → 0
+0 −1110

File deleted.

Preview size limit exceeded, changes collapsed.