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

Commit 85bdeb19 authored by Nathan Harold's avatar Nathan Harold Committed by android-build-merger
Browse files

Merge "Set the CellInfo Timestamp in the HAL" am: dbd5e56f am: 9efb9095 

am: fe3867e7

Change-Id: Ibdd08444f9137edff56bec68b8d17c36237b00b1
parents 1537a594 fe3867e7

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

+6 −1
Original line number Diff line number Diff line
@@ -5688,7 +5688,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            ArrayList<android.hardware.radio.V1_0.CellInfo> records) {

        ArrayList<CellInfo> response = new ArrayList<CellInfo>(records.size());



        final long nanotime = SystemClock.elapsedRealtimeNanos();

        for (android.hardware.radio.V1_0.CellInfo record : records) {

            record.timeStamp = nanotime;

            response.add(CellInfo.create(record));

        }
@@ -5705,7 +5707,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            ArrayList<android.hardware.radio.V1_2.CellInfo> records) {

        ArrayList<CellInfo> response = new ArrayList<CellInfo>(records.size());



        final long nanotime = SystemClock.elapsedRealtimeNanos();

        for (android.hardware.radio.V1_2.CellInfo record : records) {

            record.timeStamp = nanotime;

            response.add(CellInfo.create(record));

        }

        return response;
@@ -5721,8 +5725,9 @@ public class RIL extends BaseCommands implements CommandsInterface { 
            ArrayList<android.hardware.radio.V1_4.CellInfo> records) {

        ArrayList<CellInfo> response = new ArrayList<CellInfo>(records.size());



        final long nanotime = SystemClock.elapsedRealtimeNanos();

        for (android.hardware.radio.V1_4.CellInfo record : records) {

            response.add(CellInfo.create(record));

            response.add(CellInfo.create(record, nanotime));

        }

        return response;

    }