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

Commit d8935b34 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Renamed getTimeStamp to getTimestampMillis and added docs." am: 6f1b7122 

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

Change-Id: Iae0d59204c3775be235046e465b31933d6e99992
parents e32f384c 6f1b7122

core/api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1941,7 +1941,7 @@ package android.bluetooth { 
    method public long getControllerIdleTimeMillis();

    method public long getControllerRxTimeMillis();

    method public long getControllerTxTimeMillis();

    method public long getTimeStamp();

    method public long getTimestampMillis();

    method @NonNull public java.util.List<android.bluetooth.UidTraffic> getUidTraffic();

    method public boolean isValid();

    field public static final int BT_STACK_STATE_INVALID = 0; // 0x0

core/java/android/bluetooth/BluetoothActivityEnergyInfo.java

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

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+1 −1
Original line number Diff line number Diff line
@@ -2061,7 +2061,7 @@ public class StatsPullAtomService extends SystemService { 
        if (info == null) {

            return StatsManager.PULL_SKIP;

        }

        pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, info.getTimeStamp(),

        pulledData.add(FrameworkStatsLog.buildStatsEvent(atomTag, info.getTimestampMillis(),

                info.getBluetoothStackState(), info.getControllerTxTimeMillis(),

                info.getControllerRxTimeMillis(), info.getControllerIdleTimeMillis(),

                info.getControllerEnergyUsed()));