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

Commit 814a7ce7 authored by Aaron Tsai's avatar Aaron Tsai Committed by Automerger Merge Worker
Browse files

Merge "Add anomaly report for invalid receivedTimeMs value of NITZ" am: 3ce694f1 am: ed8d6933 

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



Change-Id: Ife5d86f91e38afa7d747d2f123362c5dc5ee2952
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5ecb8b7d ed8d6933

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

+5 −5
Original line number Diff line number Diff line
@@ -258,13 +258,13 @@ public class NetworkIndication extends IRadioNetworkIndication.Stub { 


        if (RIL.RILJ_LOGD) mRil.unsljLogRet(RIL_UNSOL_NITZ_TIME_RECEIVED, nitzTime);



        // Ignore the NITZ if ageMs is not a valid time, e.g. negative or greater than

        // receivedTimeMs.

        if ((ageMs < 0) || (ageMs >= receivedTimeMs)) {

        // Ignore the NITZ if receivedTimeMs or ageMs is not a valid time.

        // e.g. receivedTimeMs is non-positive, ageMs is negative or greater than receivedTimeMs.

        if ((receivedTimeMs <= 0) || (ageMs < 0) || (ageMs >= receivedTimeMs)) {

            AnomalyReporter.reportAnomaly(UUID.fromString("fc7c56d4-485d-475a-aaff-394203c6cdfc"),

                    "NITZ indication with invalid age");

                    "NITZ indication with invalid parameter");



            mRil.riljLoge("age time is invalid, ignoring nitzTimeReceived indication. "

            mRil.riljLoge("NITZ parameter is invalid, ignoring nitzTimeReceived indication. "

                + "receivedTimeMs = " + receivedTimeMs + ", ageMs = " + ageMs);

            return;

        }