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

Commit 48658f8a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Rename "Westworld" to "Statsd"" into rvc-dev am: e28883fe 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/11887808

Change-Id: I87efa4fdc9f3c362a1673e24f0b75ba78bfc66e6
parents e220e69f e28883fe

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -593,7 +593,7 @@ status_t AudioPolicyService::startInput(audio_port_handle_t portId) 
    }



    // including successes gets very verbose

    // but once we cut over to westworld, log them all.

    // but once we cut over to statsd, log them all.

    if (status != NO_ERROR) {



        static constexpr char kAudioPolicy[] = "audiopolicy";

services/mediametrics/AudioPowerUsage.cpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#define PROP_AUDIO_METRICS_DISABLED "persist.media.audio_metrics.power_usage_disabled"

#define AUDIO_METRICS_DISABLED_DEFAULT (false)



// property to set how long to send audio power use metrics data to westworld, default is 24hrs

// property to set how long to send audio power use metrics data to statsd, default is 24hrs

#define PROP_AUDIO_METRICS_INTERVAL_HR "persist.media.audio_metrics.interval_hr"

#define INTERVAL_HR_DEFAULT (24)

services/mediametrics/MediaMetricsService.cpp

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ status_t MediaMetricsService::submitInternal(mediametrics::Item *item, bool rele 
    }



    if (!isTrusted || item->getTimestamp() == 0) {

        // Westworld logs two times for events: ElapsedRealTimeNs (BOOTTIME) and

        // Statsd logs two times for events: ElapsedRealTimeNs (BOOTTIME) and

        // WallClockTimeNs (REALTIME), but currently logs REALTIME to cloud.

        //

        // For consistency and correlation with other logging mechanisms

services/mediametrics/MediaMetricsService.h

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public: 
    static nsecs_t roundTime(nsecs_t timeNs);



    /**

     * Returns true if we should use uid for package name when uploading to WestWorld.

     * Returns true if we should use uid for package name when uploading to statsd.

     */

    static bool useUidForPackage(const std::string& package, const std::string& installer);