summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-28 01:48:05 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-28 01:48:05 +0000
commitcf9eb11bb878716c0c12799c33c17190e1a73f3f (patch)
treec5bb1876bc17609480b43eb57c11e296c6f92dd0
parent14fbe2c7866cf2119bcf951493cb8a0be86a7290 (diff)
parenta7186caa2f0603f7f4fa2a9e13cc051f545a845d (diff)
Merge "Make ModemActivityInfo isValid system" am: fb9adf0d1e am: a7186caa2f
Change-Id: I6b64e1d19f19026688435f0fb45460b356059a85
-rwxr-xr-xapi/system-current.txt1
-rw-r--r--telephony/java/android/telephony/ModemActivityInfo.java4
2 files changed, 3 insertions, 2 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 9b62fcc03313..b0fe30525f7d 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -8987,6 +8987,7 @@ package android.telephony {
method public int getSleepTimeMillis();
method public long getTimestamp();
method @NonNull public java.util.List<android.telephony.ModemActivityInfo.TransmitPower> getTransmitPowerInfo();
+ method public boolean isValid();
method public void writeToParcel(@NonNull android.os.Parcel, int);
field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ModemActivityInfo> CREATOR;
field public static final int TX_POWER_LEVELS = 5; // 0x5
diff --git a/telephony/java/android/telephony/ModemActivityInfo.java b/telephony/java/android/telephony/ModemActivityInfo.java
index aee7cca75252..bd2375f7d297 100644
--- a/telephony/java/android/telephony/ModemActivityInfo.java
+++ b/telephony/java/android/telephony/ModemActivityInfo.java
@@ -199,10 +199,10 @@ public final class ModemActivityInfo implements Parcelable {
}
/**
+ * Indicate if the ModemActivityInfo is invalid due to modem's invalid reporting.
+ *
* @return {@code true} if this {@link ModemActivityInfo} record is valid,
* {@code false} otherwise.
- *
- * @hide
*/
public boolean isValid() {
for (TransmitPower powerInfo : getTransmitPowerInfo()) {