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

Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122f3 am: d8935b34f4 am: 50ccf0437f

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1869978

Change-Id: I3193cf144d0328d832aa43e626a76c34c02c1e2a
This commit is contained in:
Treehugger Robot
2021-10-26 23:15:37 +00:00
committed by Automerger Merge Worker
parent 3af00e82f8 50ccf0437f
commit 063a4aa8dd
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/system-current.txt
View File

@@ -1941,7 +1941,7 @@ package android.bluetooth {
method public long getControllerIdleTimeMillis(); method public long getControllerIdleTimeMillis();
method public long getControllerRxTimeMillis(); method public long getControllerRxTimeMillis();
method public long getControllerTxTimeMillis(); method public long getControllerTxTimeMillis();
method public long getTimeStamp(); method public long getTimestampMillis();
method @NonNull public java.util.List<android.bluetooth.UidTraffic> getUidTraffic(); method @NonNull public java.util.List<android.bluetooth.UidTraffic> getUidTraffic();
method public boolean isValid(); method public boolean isValid();
field public static final int BT_STACK_STATE_INVALID = 0; // 0x0 field public static final int BT_STACK_STATE_INVALID = 0; // 0x0

5
core/java/android/bluetooth/BluetoothActivityEnergyInfo.java
View File

@@ -16,6 +16,7 @@
package android.bluetooth; package android.bluetooth;
import android.annotation.ElapsedRealtimeLong;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.SystemApi; 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 * @return timestamp (real time elapsed in milliseconds since boot) of record creation
*/ */
public long getTimeStamp() { public @ElapsedRealtimeLong long getTimestampMillis() {
return mTimestamp; 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() { public boolean isValid() {
return ((mControllerTxTimeMs >= 0) && (mControllerRxTimeMs >= 0) return ((mControllerTxTimeMs >= 0) && (mControllerRxTimeMs >= 0)

2
services/core/java/com/android/server/stats/pull/StatsPullAtomService.java
View File

@@ -2061,7 +2061,7 @@ public class StatsPullAtomService extends SystemService {
if (info == null) { if (info == null) {
return StatsManager.PULL_SKIP; return StatsManager.PULL_SKIP;
} }
pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, info.getTimeStamp(), pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, info.getTimestampMillis(),
info.getBluetoothStackState(), info.getControllerTxTimeMillis(), info.getBluetoothStackState(), info.getControllerTxTimeMillis(),
info.getControllerRxTimeMillis(), info.getControllerIdleTimeMillis(), info.getControllerRxTimeMillis(), info.getControllerIdleTimeMillis(),
info.getControllerEnergyUsed())); info.getControllerEnergyUsed()));