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

Commit b2bc7b71 authored by Neil Fuller's avatar Neil Fuller
Browse files

Remove getCachedNitzData() from NitzStateMachine 

Remove getCachedNitzData() from the NitzStateMachine interface because
it is only used for a CDMA code path that probably won't exist much
longer. This simplifies the contract around NitzStateMachine. The new
behavior is not quite the same as the old (since NitzStateMachineImpl
does some validation, filtering, etc.) but it should be good enough for
the CDMA codepath.

Test: Treehugger
Bug: 140712361
Change-Id: Id083e27a140a55f15802e61f66c71929fb1c389c
parent f566eabe

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

+0 −6
Original line number Diff line number Diff line
@@ -80,12 +80,6 @@ public interface NitzStateMachine { 
     */

    void dumpLogs(FileDescriptor fd, IndentingPrintWriter ipw, String[] args);



    /**

     * Returns the last NITZ data that was cached.

     */

    @Nullable

    NitzData getCachedNitzData();



    /**

     * A proxy over read-only device state that allows things like system properties, elapsed

     * realtime clock to be faked for tests.

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

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ public final class NitzStateMachineImpl implements NitzStateMachine { 
        return mNitzTimeZoneDetectionSuccessful;

    }



    @Override

    // VisibleForTesting

    public NitzData getCachedNitzData() {

        return mLatestNitzSignal != null ? mLatestNitzSignal.getValue() : null;

    }

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

+13 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import static com.android.internal.telephony.uicc.IccRecords.CARRIER_NAME_DISPLA 


import android.annotation.IntDef;

import android.annotation.NonNull;

import android.annotation.Nullable;

import android.annotation.UnsupportedAppUsage;

import android.app.AlarmManager;

import android.app.Notification;
@@ -441,6 +442,14 @@ public class ServiceStateTracker extends Handler { 
    private CellIdentity mNewCellIdentity;

    private static final int MS_PER_HOUR = 60 * 60 * 1000;

    private final NitzStateMachine mNitzState;



    /**

     * Holds the last NITZ signal received. Used only for trying to determine an MCC from a CDMA

     * SID.

     */

    @Nullable

    private NitzData mLastNitzData;



    private final EriManager mEriManager;

    @UnsupportedAppUsage

    private final ContentResolver mCr;
@@ -1765,6 +1774,7 @@ public class ServiceStateTracker extends Handler { 
    }



    public void onAirplaneModeChanged(boolean isAirplaneModeOn) {

        mLastNitzData = null;

        mNitzState.handleAirplaneModeChanged(isAirplaneModeOn);

    }
@@ -3676,7 +3686,7 @@ public class ServiceStateTracker extends Handler { 
        int utcOffsetHours = 0;

        boolean isDst = false;

        boolean isNitzTimeZone = false;

        NitzData lastNitzData = mNitzState.getCachedNitzData();

        NitzData lastNitzData = mLastNitzData;

        if (lastNitzData != null) {

            utcOffsetHours = lastNitzData.getLocalOffsetMillis() / MS_PER_HOUR;

            Integer dstAdjustmentMillis = lastNitzData.getDstAdjustmentMillis();
@@ -3997,6 +4007,7 @@ public class ServiceStateTracker extends Handler { 
                    + " start=" + start + " delay=" + (start - nitzReceiveTime));

        }

        NitzData newNitzData = NitzData.parse(nitzString);

        mLastNitzData = newNitzData;

        if (newNitzData != null) {

            try {

                TimestampedValue<NitzData> nitzSignal =
@@ -4990,6 +5001,7 @@ public class ServiceStateTracker extends Handler { 
        pw.println(" mEmergencyOnly=" + mEmergencyOnly);

        pw.flush();

        mNitzState.dumpState(pw);

        pw.println(" mLastNitzData=" + mLastNitzData);

        pw.flush();

        pw.println(" mStartedGprsRegCheck=" + mStartedGprsRegCheck);

        pw.println(" mReportedGprsNoReg=" + mReportedGprsNoReg);