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

Commit 5305b7b8 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track PhoneTimeSuggestion API change" am: ee147b57 

am: ac5878ec

Change-Id: I494c4b59aee92569ed62e7118d8d8b63d0591749
parents 517ee5ba ac5878ec

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

+7 −4
Original line number Original line Diff line number Diff line
@@ -402,7 +402,8 @@ public final class NitzStateMachineImpl implements NitzStateMachine { 
    }

    }





    private void sendEmptyTimeSuggestion(String reason) {

    private void sendEmptyTimeSuggestion(String reason) {

        PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(mPhone.getPhoneId());

        PhoneTimeSuggestion timeSuggestion =

                new PhoneTimeSuggestion.Builder(mPhone.getPhoneId()).build();

        timeSuggestion.addDebugInfo("Empty suggestion, reason=" + reason);

        timeSuggestion.addDebugInfo("Empty suggestion, reason=" + reason);

        mTimeServiceHelper.suggestDeviceTime(timeSuggestion);

        mTimeServiceHelper.suggestDeviceTime(timeSuggestion);

    }

    }
@@ -484,9 +485,11 @@ public final class NitzStateMachineImpl implements NitzStateMachine { 
                Rlog.d(LOG_TAG, logMsg);

                Rlog.d(LOG_TAG, logMsg);

            }

            }

            mTimeLog.log(logMsg);

            mTimeLog.log(logMsg);

            PhoneTimeSuggestion phoneTimeSuggestion = new PhoneTimeSuggestion(mPhone.getPhoneId());

            PhoneTimeSuggestion phoneTimeSuggestion =

            phoneTimeSuggestion.setUtcTime(newNitzTime);

                    new PhoneTimeSuggestion.Builder(mPhone.getPhoneId())

            phoneTimeSuggestion.addDebugInfo(logMsg);

                            .setUtcTime(newNitzTime)

                            .addDebugInfo(logMsg)

                            .build();

            mTimeServiceHelper.suggestDeviceTime(phoneTimeSuggestion);

            mTimeServiceHelper.suggestDeviceTime(phoneTimeSuggestion);





            TelephonyMetrics.getInstance().writeNITZEvent(

            TelephonyMetrics.getInstance().writeNITZEvent(

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -312,20 +312,20 @@ public final class NewNitzStateMachineImpl implements NitzStateMachine { 
        try {

        try {

            Objects.requireNonNull(reason);

            Objects.requireNonNull(reason);





            PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(mPhoneId);

            PhoneTimeSuggestion.Builder builder = new PhoneTimeSuggestion.Builder(mPhoneId);

            if (nitzSignal == null) {

            if (nitzSignal == null) {

                timeSuggestion.addDebugInfo("Clearing time zone suggestion"

                builder.addDebugInfo("Clearing time zone suggestion"

                        + " reason=" + reason);

                        + " reason=" + reason);

            } else {

            } else {

                TimestampedValue<Long> newNitzTime = new TimestampedValue<>(

                TimestampedValue<Long> newNitzTime = new TimestampedValue<>(

                        nitzSignal.getReferenceTimeMillis(),

                        nitzSignal.getReferenceTimeMillis(),

                        nitzSignal.getValue().getCurrentTimeInMillis());

                        nitzSignal.getValue().getCurrentTimeInMillis());

                timeSuggestion.setUtcTime(newNitzTime);

                builder.setUtcTime(newNitzTime);

                timeSuggestion.addDebugInfo("Sending new time zone suggestion"

                builder.addDebugInfo("Sending new time zone suggestion"

                        + " nitzSignal=" + nitzSignal

                        + " nitzSignal=" + nitzSignal

                        + ", reason=" + reason);

                        + ", reason=" + reason);

            }

            }

            mNewTimeServiceHelper.suggestDeviceTime(timeSuggestion);

            mNewTimeServiceHelper.suggestDeviceTime(builder.build());

        } catch (RuntimeException ex) {

        } catch (RuntimeException ex) {

            Rlog.e(LOG_TAG, "doTimeDetection: Exception thrown"

            Rlog.e(LOG_TAG, "doTimeDetection: Exception thrown"

                    + " mPhoneId=" + mPhoneId

                    + " mPhoneId=" + mPhoneId

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -278,17 +278,17 @@ public final class NitzStateMachineTestSupport { 
    }

    }





    public static PhoneTimeSuggestion createEmptyTimeSuggestion(int phoneId) {

    public static PhoneTimeSuggestion createEmptyTimeSuggestion(int phoneId) {

        PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(phoneId);

        return new PhoneTimeSuggestion.Builder(phoneId)

        timeSuggestion.addDebugInfo("Test");

                .addDebugInfo("Test")

        return timeSuggestion;

                .build();

    }

    }





    public static PhoneTimeSuggestion createTimeSuggestionFromNitzSignal(

    public static PhoneTimeSuggestion createTimeSuggestionFromNitzSignal(

            int phoneId, TimestampedValue<NitzData> nitzSignal) {

            int phoneId, TimestampedValue<NitzData> nitzSignal) {

        PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(phoneId);

        return new PhoneTimeSuggestion.Builder(phoneId)

        timeSuggestion.setUtcTime(createTimeSignalFromNitzSignal(nitzSignal));

                .setUtcTime(createTimeSignalFromNitzSignal(nitzSignal))

        timeSuggestion.addDebugInfo("Test");

                .addDebugInfo("Test")

        return timeSuggestion;

                .build();

    }

    }





    public static TimestampedValue<Long> createTimeSignalFromNitzSignal(

    public static TimestampedValue<Long> createTimeSignalFromNitzSignal(