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

Commit 60ffab55 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "remove getEnergyUsed API in modemActivityInfo" am: d0dd1276 am: 0cc33976 

Change-Id: I70ab6904cf3f7214d3e9234b982686cfc5ed8a71
parents a88a5a47 0cc33976

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

+1 −1
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ public class RIL extends BaseCommands implements CommandsInterface { 
        switch(rr.mRequest) {

            case RIL_REQUEST_GET_ACTIVITY_INFO:

                timeoutResponse = new ModemActivityInfo(

                        0, 0, 0, new int [ModemActivityInfo.TX_POWER_LEVELS], 0, 0);

                        0, 0, 0, new int [ModemActivityInfo.TX_POWER_LEVELS], 0);

                break;

        };

        return timeoutResponse;

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

+2 −2
Original line number Diff line number Diff line
@@ -2193,10 +2193,10 @@ public class RadioResponse extends IRadioResponse.Stub { 
                }

                final int rxModeTimeMs = activityInfo.rxModeTimeMs;

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

                        idleModeTimeMs, txModeTimeMs, rxModeTimeMs, 0);

                        idleModeTimeMs, txModeTimeMs, rxModeTimeMs);

            } else {

                ret = new ModemActivityInfo(0, 0, 0, new int [ModemActivityInfo.TX_POWER_LEVELS],

                        0, 0);

                        0);

                responseInfo.error = RadioError.NONE;

            }

            sendMessageResponse(rr.mResult, ret);