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

Commit dade9e6d authored by Chen Xu's avatar Chen Xu Committed by Android (Google) Code Review
Browse files

Merge "remove getEnergyUsed API in modemActivityInfo"

parents 63dbbd05 8420c943

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

+1 −1
Original line number Diff line number Diff line
@@ -378,7 +378,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
@@ -2186,10 +2186,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);