summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-10-26 22:46:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-26 22:46:13 +0000
commit50ccf0437f0c64d88db3e35fe1a43473447441e2 (patch)
tree84a3e5abd993e0460a689e22d400ab253ebd260a /core/java/android
parentdb319657ed30df40db24f856279bc78c9f8bfab7 (diff)
parentd8935b34f41f84d2cf3acdb22109a3a4d5fd1737 (diff)
Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122f3 am: d8935b34f4
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869978 Change-Id: I4ad9815b55742305007388054eb34397de03cb4d
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/bluetooth/BluetoothActivityEnergyInfo.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/bluetooth/BluetoothActivityEnergyInfo.java b/core/java/android/bluetooth/BluetoothActivityEnergyInfo.java
index f371c6d78221..c17a7b4b3dfd 100644
--- a/core/java/android/bluetooth/BluetoothActivityEnergyInfo.java
+++ b/core/java/android/bluetooth/BluetoothActivityEnergyInfo.java
@@ -16,6 +16,7 @@
package android.bluetooth;
+import android.annotation.ElapsedRealtimeLong;
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.SystemApi;
@@ -167,7 +168,7 @@ public final class BluetoothActivityEnergyInfo implements Parcelable {
/**
* @return timestamp (real time elapsed in milliseconds since boot) of record creation
*/
- public long getTimeStamp() {
+ public @ElapsedRealtimeLong long getTimestampMillis() {
return mTimestamp;
}
@@ -189,7 +190,7 @@ public final class BluetoothActivityEnergyInfo implements Parcelable {
}
/**
- * @return true if the record is valid
+ * @return true if the record Tx time, Rx time, and Idle time are more than 0.
*/
public boolean isValid() {
return ((mControllerTxTimeMs >= 0) && (mControllerRxTimeMs >= 0)