diff options
| author | 2020-03-24 00:09:05 +0000 | |
|---|---|---|
| committer | 2020-03-24 00:09:05 +0000 | |
| commit | 393c9121cea9e03762b3e5460d523b9d5393f6f7 (patch) | |
| tree | fc424d92837510a2129b13bef9a114d64e8574f6 | |
| parent | 48b68ffe6e0bad1eceee0fa412c202f6f5b78b19 (diff) | |
| parent | 9bfde0e1fdb3dc981e49dc761ed2abeca270421c (diff) | |
Merge "Hide CellularBatteryStats#getTxTimeMillis." into rvc-dev
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/os/connectivity/CellularBatteryStats.java | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/api/system-current.txt b/api/system-current.txt index 369012ccd01a..a1fd0dbd8df0 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -8659,7 +8659,6 @@ package android.os.connectivity { method public long getSleepTimeMillis(); 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 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); field @NonNull public static final android.os.Parcelable.Creator<android.os.connectivity.CellularBatteryStats> CREATOR; } diff --git a/core/java/android/os/connectivity/CellularBatteryStats.java b/core/java/android/os/connectivity/CellularBatteryStats.java index 633b3740fb61..121fd333d17f 100644 --- a/core/java/android/os/connectivity/CellularBatteryStats.java +++ b/core/java/android/os/connectivity/CellularBatteryStats.java @@ -315,6 +315,8 @@ public final class CellularBatteryStats implements Parcelable { * <li> index 3 = 15dBm < tx_power < 20dBm. </li> * <li> index 4 = tx_power > 20dBm. </li> * </ul> + * + * @hide */ @NonNull public long getTxTimeMillis( |