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

Merge "Hide CellularBatteryStats#getTxTimeMillis." into rvc-dev am: 393c9121ce am: 89db2eb06a

Browse Source 
Change-Id: I8d636118ae5b31c30f05474b81f0a97ce5fad02c
This commit is contained in:
TreeHugger Robot
2020-03-24 00:43:59 +00:00
committed by Automerger Merge Worker
parent ddf3d32434 89db2eb06a
commit 4f71f44553
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -8659,7 +8659,6 @@ package android.os.connectivity {
method public long getSleepTimeMillis(); method public long getSleepTimeMillis();
method @NonNull public long getTimeInRatMicros(int); method @NonNull public long getTimeInRatMicros(int);
method @NonNull public long getTimeInRxSignalStrengthLevelMicros(@IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) int); method @NonNull public long getTimeInRxSignalStrengthLevelMicros(@IntRange(from=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_NONE_OR_UNKNOWN, to=android.telephony.CellSignalStrength.SIGNAL_STRENGTH_GREAT) int);
method @NonNull public long getTxTimeMillis(@IntRange(from=android.telephony.ModemActivityInfo.TX_POWER_LEVEL_0, to=android.telephony.ModemActivityInfo.TX_POWER_LEVEL_4) int);
method public void writeToParcel(@NonNull android.os.Parcel, int); method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.CellularBatteryStats> CREATOR; field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.CellularBatteryStats> CREATOR;
} }

2
core/java/android/os/connectivity/CellularBatteryStats.java
View File

@@ -315,6 +315,8 @@ public final class CellularBatteryStats implements Parcelable {
* <li> index 3 = 15dBm < tx_power < 20dBm. </li> * <li> index 3 = 15dBm < tx_power < 20dBm. </li>
* <li> index 4 = tx_power > 20dBm. </li> * <li> index 4 = tx_power > 20dBm. </li>
* </ul> * </ul>
*
* @hide
*/ */
@NonNull @NonNull
public long getTxTimeMillis( public long getTxTimeMillis(