Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 95c47788 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Hide CellularBatteryStats#getTxTimeMillis." into rvc-dev am: 393c9121... 

Merge "Hide CellularBatteryStats#getTxTimeMillis." into rvc-dev am: 393c9121 am: 89db2eb0 am: f430b168

Change-Id: I711e5879bd7d5ec5d543bd6400953c5f413901fc
parents 02684f6f f430b168

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -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;

  }

  }

core/java/android/os/connectivity/CellularBatteryStats.java

+2 −0
Original line number Original line Diff line number Diff line
@@ -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(