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

Commit 3dd6a5e4 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Fix name in string constants" am: 9c67a28e am: 270bdb94 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/2034105

Change-Id: Iee1c4d7ffb173f5bb02a68075ba616ec0f616f6a
parents 4278b509 270bdb94

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

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public final class NitzStateMachineImpl implements NitzStateMachine { 
                @Nullable NitzSignal nitzSignal);

    }



    static final String LOG_TAG = "NewNitzStateMachineImpl";

    static final String LOG_TAG = "NitzStateMachineImpl";

    static final boolean DBG = true;



    // Miscellaneous dependencies and helpers not related to detection state.

tests/telephonytests/src/com/android/internal/telephony/nitz/NitzStateMachineImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ public class NitzStateMachineImplTest extends TelephonyTest { 
                SLOT_INDEX, mFakeDeviceState, mFakeNitzSignalInputFilter, mRealTimeZoneSuggester,

                mFakeTimeServiceHelper);



        TelephonyTest.logd("NewNitzStateMachineImplTest -Setup!");

        TelephonyTest.logd("NitzStateMachineImplTest -Setup!");

    }



    @After