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

Commit ca70f36f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Avoid build break while handling getModemActivityInfoResponse" am:... 

Merge "Avoid build break while handling getModemActivityInfoResponse" am: 96fe883d am: 1e6403df am: 6b5fa70e am: 860ae852

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

Change-Id: If43966ee0b8ccd8ba45a500bc18ea65e2ed8e938
parents 4c4c89c1 860ae852

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

+3 −2
Original line number Diff line number Diff line
@@ -104,10 +104,11 @@ public class ModemResponse extends IRadioModemResponse.Stub { 
                final int sleepModeTimeMs = activityInfo.sleepModeTimeMs;

                final int idleModeTimeMs = activityInfo.idleModeTimeMs;

                int [] txModeTimeMs = new int[ModemActivityInfo.getNumTxPowerLevels()];

                // TODO: update the function as per the new API introduced in Android T

                for (int i = 0; i < ModemActivityInfo.getNumTxPowerLevels(); i++) {

                    txModeTimeMs[i] = activityInfo.txmModetimeMs[i];

                    txModeTimeMs[i] = activityInfo.techSpecificInfo[0].txmModetimeMs[i];

                }

                final int rxModeTimeMs = activityInfo.rxModeTimeMs;

                final int rxModeTimeMs = activityInfo.techSpecificInfo[0].rxModeTimeMs;

                ret = new ModemActivityInfo(SystemClock.elapsedRealtime(), sleepModeTimeMs,

                        idleModeTimeMs, txModeTimeMs, rxModeTimeMs);

            } else {