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

Commit 12de6f5a authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Track PhoneTimeSuggestion API change" am: ee147b57 am: ac5878ec 

am: 5305b7b8

Change-Id: Ia8899c1bd4a7b75d98096c82322ba6a20430f3ff
parents 8df8936e 5305b7b8

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

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



    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);

        mTimeServiceHelper.suggestDeviceTime(timeSuggestion);

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

            }

            mTimeLog.log(logMsg);

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

            phoneTimeSuggestion.setUtcTime(newNitzTime);

            phoneTimeSuggestion.addDebugInfo(logMsg);

            PhoneTimeSuggestion phoneTimeSuggestion =

                    new PhoneTimeSuggestion.Builder(mPhone.getPhoneId())

                            .setUtcTime(newNitzTime)

                            .addDebugInfo(logMsg)

                            .build();

            mTimeServiceHelper.suggestDeviceTime(phoneTimeSuggestion);



            TelephonyMetrics.getInstance().writeNITZEvent(

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

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

            Objects.requireNonNull(reason);



            PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(mPhoneId);

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

            if (nitzSignal == null) {

                timeSuggestion.addDebugInfo("Clearing time zone suggestion"

                builder.addDebugInfo("Clearing time zone suggestion"

                        + " reason=" + reason);

            } else {

                TimestampedValue<Long> newNitzTime = new TimestampedValue<>(

                        nitzSignal.getReferenceTimeMillis(),

                        nitzSignal.getValue().getCurrentTimeInMillis());

                timeSuggestion.setUtcTime(newNitzTime);

                timeSuggestion.addDebugInfo("Sending new time zone suggestion"

                builder.setUtcTime(newNitzTime);

                builder.addDebugInfo("Sending new time zone suggestion"

                        + " nitzSignal=" + nitzSignal

                        + ", reason=" + reason);

            }

            mNewTimeServiceHelper.suggestDeviceTime(timeSuggestion);

            mNewTimeServiceHelper.suggestDeviceTime(builder.build());

        } catch (RuntimeException ex) {

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

                    + " mPhoneId=" + mPhoneId

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

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



    public static PhoneTimeSuggestion createEmptyTimeSuggestion(int phoneId) {

        PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(phoneId);

        timeSuggestion.addDebugInfo("Test");

        return timeSuggestion;

        return new PhoneTimeSuggestion.Builder(phoneId)

                .addDebugInfo("Test")

                .build();

    }



    public static PhoneTimeSuggestion createTimeSuggestionFromNitzSignal(

            int phoneId, TimestampedValue<NitzData> nitzSignal) {

        PhoneTimeSuggestion timeSuggestion = new PhoneTimeSuggestion(phoneId);

        timeSuggestion.setUtcTime(createTimeSignalFromNitzSignal(nitzSignal));

        timeSuggestion.addDebugInfo("Test");

        return timeSuggestion;

        return new PhoneTimeSuggestion.Builder(phoneId)

                .setUtcTime(createTimeSignalFromNitzSignal(nitzSignal))

                .addDebugInfo("Test")

                .build();

    }



    public static TimestampedValue<Long> createTimeSignalFromNitzSignal(