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

Commit 0386c7c7 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Create a new implementation of NitzStateMachine" am: a62554e5 am: baf04349 

am: 8c98bef6

Change-Id: I02e69b1b6bbbfb0604ea8a1c793ea660cc8214b5
parents fc071cbe 8c98bef6

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

+19 −6
Original line number Diff line number Diff line
@@ -350,14 +350,27 @@ 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) {

        if (!TimeServiceHelper.isTimeZoneSettingInitializedStatic()) {

        // 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) {

                    // Set time zone based on MCC

                TimeServiceHelper.setDeviceTimeZoneStatic(context, zoneId);

                    NewTimeServiceHelper.setDeviceTimeZoneStatic(context, zoneId);

                    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/NewNitzStateMachine.java

0 → 100644
+533 −0

File added.

Preview size limit exceeded, changes collapsed.

src/java/com/android/internal/telephony/TimeServiceHelper.java→src/java/com/android/internal/telephony/NewTimeServiceHelper.java

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.provider.Settings; 
 * new service.

 */

// Non-final to allow mocking.

public class TimeServiceHelper {

public class NewTimeServiceHelper {



    /**

     * Callback interface for automatic detection enable/disable changes.
@@ -57,7 +57,7 @@ public class TimeServiceHelper { 
    private Listener mListener;



    /** Creates a TimeServiceHelper */

    public TimeServiceHelper(Context context) {

    public NewTimeServiceHelper(Context context) {

        mContext = context;

        mCr = context.getContentResolver();

    }

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

+4 −4

File changed.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+193 −0

File added.

Preview size limit exceeded, changes collapsed.