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

Merge "Allow null TransmitPowerRange ctor argument for ModemActivityInfo"

Browse Source
This commit is contained in:
Tomasz Wasilczyk
2019-11-25 18:18:17 +00:00
committed by Android (Google) Code Review
parent d74687f679 c6dd53b367
commit 896d585ddd
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/system-current.txt
View File

@@ -8556,7 +8556,7 @@ package android.telephony {
}
public final class ModemActivityInfo implements android.os.Parcelable {
ctor public ModemActivityInfo(long, int, int, @NonNull int[], int);
ctor public ModemActivityInfo(long, int, int, @Nullable int[], int);
method public int describeContents();
method public int getIdleTimeMillis();
method public int getReceiveTimeMillis();

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

@@ -17,6 +17,7 @@
package android.telephony;
import android.annotation.NonNull;
import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.os.Parcel;
import android.os.Parcelable;
@@ -59,7 +60,7 @@ public final class ModemActivityInfo implements Parcelable {
private int mRxTimeMs;
public ModemActivityInfo(long timestamp, int sleepTimeMs, int idleTimeMs,
@NonNull int[] txTimeMs, int rxTimeMs) {
@Nullable int[] txTimeMs, int rxTimeMs) {
mTimestamp = timestamp;
mSleepTimeMs = sleepTimeMs;
mIdleTimeMs = idleTimeMs;
@@ -68,10 +69,13 @@ public final class ModemActivityInfo implements Parcelable {
}
/** helper API to populate tx power range for each bucket **/
private void populateTransmitPowerRange(@NonNull int[] transmitPowerMs) {
private void populateTransmitPowerRange(@Nullable int[] transmitPowerMs) {
int i = 0;
for ( ; i < Math.min(transmitPowerMs.length, TX_POWER_LEVELS); i++) {
mTransmitPowerInfo.add(i, new TransmitPower(TX_POWER_RANGES[i], transmitPowerMs[i]));
if (transmitPowerMs != null) {
for ( ; i < Math.min(transmitPowerMs.length, TX_POWER_LEVELS); i++) {
mTransmitPowerInfo.add(i,
new TransmitPower(TX_POWER_RANGES[i], transmitPowerMs[i]));
}
}
// Make sure that mTransmitPowerInfo is fully initialized.
for ( ; i < TX_POWER_LEVELS; i++) {
@@ -94,7 +98,7 @@ public final class ModemActivityInfo implements Parcelable {
return 0;
}
public static final @android.annotation.NonNull Parcelable.Creator<ModemActivityInfo> CREATOR =
public static final @NonNull Parcelable.Creator<ModemActivityInfo> CREATOR =
new Parcelable.Creator<ModemActivityInfo>() {
public ModemActivityInfo createFromParcel(Parcel in) {
long timestamp = in.readLong();
@@ -149,7 +153,7 @@ public final class ModemActivityInfo implements Parcelable {
}
/** @hide */
public void setTransmitTimeMillis(int[] txTimeMs) {
public void setTransmitTimeMillis(@Nullable int[] txTimeMs) {
populateTransmitPowerRange(txTimeMs);
}