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

Commit fb3919b0 authored Oct 12, 2020 by Hall Liu Committed by Sarah Chin Sep 07, 2021

Use getter method for number of TX power levels

Bug: 170427831
Test: atest ModemActivityInfoTest
Change-Id: I344afaba28ba4308bd2197f3247dba4b8f3055e1
Merged-In: I344afaba28ba4308bd2197f3247dba4b8f3055e1

parent 5700d095

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -431,7 +431,7 @@ public class RIL extends BaseCommands implements CommandsInterface {
	switch(rr.mRequest) {		switch(rr.mRequest) {
	case RIL_REQUEST_GET_ACTIVITY_INFO:		case RIL_REQUEST_GET_ACTIVITY_INFO:
	timeoutResponse = new ModemActivityInfo(		timeoutResponse = new ModemActivityInfo(
	0, 0, 0, new int [ModemActivityInfo.TX_POWER_LEVELS], 0);		0, 0, 0, new int [ModemActivityInfo.getNumTxPowerLevels()], 0);
	break;		break;
	};		};
	return timeoutResponse;		return timeoutResponse;

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2820,16 +2820,16 @@ public class RadioResponse extends IRadioResponse.Stub {
	if (responseInfo.error == RadioError.NONE) {		if (responseInfo.error == RadioError.NONE) {
	final int sleepModeTimeMs = activityInfo.sleepModeTimeMs;		final int sleepModeTimeMs = activityInfo.sleepModeTimeMs;
	final int idleModeTimeMs = activityInfo.idleModeTimeMs;		final int idleModeTimeMs = activityInfo.idleModeTimeMs;
	int [] txModeTimeMs = new int[ModemActivityInfo.TX_POWER_LEVELS];		int [] txModeTimeMs = new int[ModemActivityInfo.getNumTxPowerLevels()];
	for (int i = 0; i < ModemActivityInfo.TX_POWER_LEVELS; i++) {		for (int i = 0; i < ModemActivityInfo.getNumTxPowerLevels(); i++) {
	txModeTimeMs[i] = activityInfo.txmModetimeMs[i];		txModeTimeMs[i] = activityInfo.txmModetimeMs[i];
	}		}
	final int rxModeTimeMs = activityInfo.rxModeTimeMs;		final int rxModeTimeMs = activityInfo.rxModeTimeMs;
	ret = new ModemActivityInfo(SystemClock.elapsedRealtime(), sleepModeTimeMs,		ret = new ModemActivityInfo(SystemClock.elapsedRealtime(), sleepModeTimeMs,
	idleModeTimeMs, txModeTimeMs, rxModeTimeMs);		idleModeTimeMs, txModeTimeMs, rxModeTimeMs);
	} else {		} else {
	ret = new ModemActivityInfo(0, 0, 0, new int [ModemActivityInfo.TX_POWER_LEVELS],		ret = new ModemActivityInfo(0, 0, 0,
	0);		new int[ModemActivityInfo.getNumTxPowerLevels()], 0);
	responseInfo.error = RadioError.NONE;		responseInfo.error = RadioError.NONE;
	}		}
	sendMessageResponse(rr.mResult, ret);		sendMessageResponse(rr.mResult, ret);

src/java/com/android/internal/telephony/metrics/ModemPowerMetrics.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ public class ModemPowerMetrics {
	m.rxTimeMs = stats.getRxTimeMillis();		m.rxTimeMs = stats.getRxTimeMillis();

	List<Long> txTimeMillis = new ArrayList<>();		List<Long> txTimeMillis = new ArrayList<>();
	for (int i = 0; i < ModemActivityInfo.TX_POWER_LEVELS; i++) {		for (int i = 0; i < ModemActivityInfo.getNumTxPowerLevels(); i++) {
	long t = stats.getTxTimeMillis(i);		long t = stats.getTxTimeMillis(i);
	if (t >= 0) {		if (t >= 0) {
	txTimeMillis.add(t);		txTimeMillis.add(t);