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

Commit 0aa92ed6 authored by Neil Fuller's avatar Neil Fuller Committed by android-build-merger
Browse files

Merge "Fix incorrect order of arguments / fix bug" am: d07a9582 

am: 06c364c2

Change-Id: I23141df5b6e90ca4379e993ae991d1357a95ab87
parents 4d8e8c6d 06c364c2

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

+2 −1
Original line number Diff line number Diff line
@@ -383,7 +383,8 @@ public final class NewNitzStateMachine implements NitzStateMachine { 
                // Save the last NITZ time signal used so we can return to it later

                // if auto-time detection is toggled.

                mSavedNitzTime = new TimestampedValue<>(

                        adjustedCurrentTimeMillis, nitzSignal.getReferenceTimeMillis());

                        nitzSignal.getReferenceTimeMillis(),

                        nitzSignal.getValue().getCurrentTimeInMillis());

            } finally {

                mWakeLock.release();

            }

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

+2 −1
Original line number Diff line number Diff line
@@ -383,7 +383,8 @@ public final class OldNitzStateMachine implements NitzStateMachine { 
                // Save the last NITZ time signal used so we can return to it later

                // if auto-time detection is toggled.

                mSavedNitzTime = new TimestampedValue<>(

                        adjustedCurrentTimeMillis, nitzSignal.getReferenceTimeMillis());

                        nitzSignal.getReferenceTimeMillis(),

                        nitzSignal.getValue().getCurrentTimeInMillis());

            } finally {

                mWakeLock.release();

            }