Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Additional checks for ModemActivityInfo.isValid()" into nyc-dev

Browse Source
This commit is contained in:
Nathan Harold
2016-04-21 02:09:26 +00:00
committed by Android (Google) Code Review
parent 4b88bddb12 98a40d3ca6
commit f6496db8ce
1 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
telephony/java/android/telephony/ModemActivityInfo.java
View File

@@ -151,12 +151,24 @@ public class ModemActivityInfo implements Parcelable {
* @return if the record is valid * @return if the record is valid
*/ */
public boolean isValid() { public boolean isValid() {
int totalTxTimeMs = 0; for (int txVal : getTxTimeMillis()) {
int txTime [] = getTxTimeMillis(); if(txVal < 0) {
for (int i = 0; i < TX_POWER_LEVELS; i++) { return false;
totalTxTimeMs += txTime[i]; }
} }
return ((getIdleTimeMillis() >= 0) && (totalTxTimeMs >= 0)
&& (getSleepTimeMillis() >= 0) && (getIdleTimeMillis() >= 0)); return ((getIdleTimeMillis() >= 0) && (getSleepTimeMillis() >= 0)
&& (getRxTimeMillis() >= 0) && (getEnergyUsed() >= 0) && !isEmpty());
}
private boolean isEmpty() {
for (int txVal : getTxTimeMillis()) {
if(txVal != 0) {
return false;
}
}
return ((getIdleTimeMillis() == 0) && (getSleepTimeMillis() == 0)
&& (getRxTimeMillis() == 0) && (getEnergyUsed() == 0));
} }
} }