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 
am: f6496db8ce

* commit 'f6496db8cefe68b2d02fde22a68b84f7b5c86686':
  Additional checks for ModemActivityInfo.isValid()

Change-Id: If8f3bb4e47ab526961dbb1209e69aa8dd09f5b40
This commit is contained in:
Nathan Harold
2016-04-21 02:16:03 +00:00
committed by android-build-merger
parent 09587468a5 f6496db8ce
commit 2a403859b6
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
*/
public boolean isValid() {
int totalTxTimeMs = 0;
int txTime [] = getTxTimeMillis();
for (int i = 0; i < TX_POWER_LEVELS; i++) {
totalTxTimeMs += txTime[i];
for (int txVal : getTxTimeMillis()) {
if(txVal < 0) {
return false;
}
}
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));
}
}