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

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

Merge changes I46f81275,I36d58043 

* changes:
  Remove phone type-specific time detection logic
  Remove throttling difference for GSM
parents c9698787 96ccee36

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

+21 −28
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ public class NitzStateMachine { 
                long adjustedCurrentTimeMillis = newNitzData.getCurrentTimeInMillis();

                adjustedCurrentTimeMillis += millisSinceNitzReceived;



                if (!mPhone.isPhoneTypeGsm() || mTimeServiceHelper.isTimeDetectionEnabled()) {

                if (mTimeServiceHelper.isTimeDetectionEnabled()) {

                    String tmpLog = "NITZ: newNitaData=" + newNitzData

                            + " nitzReceiveTime=" + nitzReceiveTime

                            + " Setting time of day to " + adjustedCurrentTimeMillis
@@ -465,11 +465,6 @@ public class NitzStateMachine { 
                        Rlog.d(LOG_TAG, tmpLog);

                    }

                    mTimeLog.log(tmpLog);

                    if (mPhone.isPhoneTypeGsm()) {

                        setAndBroadcastNetworkSetTime(adjustedCurrentTimeMillis);

                        Rlog.i(LOG_TAG, "NITZ: after Setting time of day");

                    } else {

                        if (mTimeServiceHelper.isTimeDetectionEnabled()) {

                    // Update system time automatically

                    long gained = adjustedCurrentTimeMillis - System.currentTimeMillis();

                    long timeSinceLastUpdate =
@@ -495,8 +490,6 @@ public class NitzStateMachine { 
                        return;

                    }

                }

                    }

                }

                saveNitzTime(adjustedCurrentTimeMillis);

            } finally {

                mWakeLock.release();