commit 5ca0261daea688da4e7965066c88ace69891a489
author Sarah Chin <sarahchin@google.com> Tue Sep 07 21:57:26 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 07 21:57:26 2021 +0000
tree 434ccece1129fa0f2db0597e0e153ce062340216
parent 5700d09545c9ec5f54da7aebb009c60d4136d0b7
parent fb3919b00b4fade10458cf8d4181f19fe0cadcb1

Merge "Use getter method for number of TX power levels"

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

diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java
index 7cd9ac9..5b3d7b4 100644
--- a/src/java/com/android/internal/telephony/RIL.java
+++ b/src/java/com/android/internal/telephony/RIL.java
@@ -431,7 +431,7 @@
         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, new int [ModemActivityInfo.getNumTxPowerLevels()], 0);
                 break;
         };
         return timeoutResponse;

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

diff --git a/src/java/com/android/internal/telephony/RadioResponse.java b/src/java/com/android/internal/telephony/RadioResponse.java
index e0e7912..96ca9fa 100644
--- a/src/java/com/android/internal/telephony/RadioResponse.java
+++ b/src/java/com/android/internal/telephony/RadioResponse.java
@@ -2820,16 +2820,16 @@
             if (responseInfo.error == RadioError.NONE) {
                 final int sleepModeTimeMs = activityInfo.sleepModeTimeMs;
                 final int idleModeTimeMs = activityInfo.idleModeTimeMs;
-                int [] txModeTimeMs = new int[ModemActivityInfo.TX_POWER_LEVELS];
-                for (int i = 0; i < ModemActivityInfo.TX_POWER_LEVELS; i++) {
+                int [] txModeTimeMs = new int[ModemActivityInfo.getNumTxPowerLevels()];
+                for (int i = 0; i < ModemActivityInfo.getNumTxPowerLevels(); i++) {
                     txModeTimeMs[i] = activityInfo.txmModetimeMs[i];
                 }
                 final int rxModeTimeMs = activityInfo.rxModeTimeMs;
                 ret = new ModemActivityInfo(SystemClock.elapsedRealtime(), sleepModeTimeMs,
                         idleModeTimeMs, txModeTimeMs, rxModeTimeMs);
             } else {
-                ret = new ModemActivityInfo(0, 0, 0, new int [ModemActivityInfo.TX_POWER_LEVELS],
-                        0);
+                ret = new ModemActivityInfo(0, 0, 0,
+                        new int[ModemActivityInfo.getNumTxPowerLevels()], 0);
                 responseInfo.error = RadioError.NONE;
             }
             sendMessageResponse(rr.mResult, ret);

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

diff --git a/src/java/com/android/internal/telephony/metrics/ModemPowerMetrics.java b/src/java/com/android/internal/telephony/metrics/ModemPowerMetrics.java
index 67816c9..ad27acb 100644
--- a/src/java/com/android/internal/telephony/metrics/ModemPowerMetrics.java
+++ b/src/java/com/android/internal/telephony/metrics/ModemPowerMetrics.java
@@ -71,7 +71,7 @@
             m.rxTimeMs = stats.getRxTimeMillis();
 
             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);
                 if (t >= 0) {
                     txTimeMillis.add(t);