diff options
| author | Scott Lobdell <slobdell@google.com> | 2019-02-19 10:33:50 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2019-02-19 11:36:09 -0800 |
| commit | 81b587a542e8381268a9ba8e7461712ef23cd11f (patch) | |
| tree | bace051dc4f3efad7dcd091ea0481167815bfaa7 /cmds/statsd/src/StatsService.cpp | |
| parent | bf4a1865530dd9a1e4b203d4e9d67fce0958c3fa (diff) | |
| parent | 13327cc461d8f54550866bc404a99205f95ab92f (diff) | |
Merge QP1A.190212.003
Conflicts:
core/java/android/view/SurfaceControl.java
media/java/android/media/MediaCodecInfo.java
packages/SettingsLib/res/values/strings.xml
services/core/java/com/android/server/am/ActiveServices.java
services/core/java/com/android/server/am/OomAdjuster.java
services/core/java/com/android/server/audio/AudioDeviceInventory.java
services/core/java/com/android/server/display/LocalDisplayAdapter.java
services/core/java/com/android/server/wm/ActivityDisplay.java
services/core/java/com/android/server/wm/DisplayPolicy.java
Change-Id: Idc7582978996d2f7c44f599f221e8d7cc9eedf43
Diffstat (limited to 'cmds/statsd/src/StatsService.cpp')
| -rw-r--r-- | cmds/statsd/src/StatsService.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmds/statsd/src/StatsService.cpp b/cmds/statsd/src/StatsService.cpp index b26c713877db..86bf3eca3ee6 100644 --- a/cmds/statsd/src/StatsService.cpp +++ b/cmds/statsd/src/StatsService.cpp @@ -161,7 +161,8 @@ StatsService::StatsService(const sp<Looper>& handlerLooper) mConfigManager = new ConfigManager(); mProcessor = new StatsLogProcessor( mUidMap, mPullerManager, mAnomalyAlarmMonitor, mPeriodicAlarmMonitor, - getElapsedRealtimeNs(), [this](const ConfigKey& key) { + getElapsedRealtimeNs(), + [this](const ConfigKey& key) { sp<IStatsCompanionService> sc = getStatsCompanionService(); auto receiver = mConfigManager->GetConfigReceiver(key); if (sc == nullptr) { @@ -867,6 +868,7 @@ Status StatsService::informDeviceShutdown() { ENFORCE_UID(AID_SYSTEM); VLOG("StatsService::informDeviceShutdown"); mProcessor->WriteDataToDisk(DEVICE_SHUTDOWN); + mProcessor->WriteMetricsActivationToDisk(getElapsedRealtimeNs()); return Status::ok(); } @@ -901,6 +903,7 @@ Status StatsService::statsCompanionReady() { void StatsService::Startup() { mConfigManager->Startup(); + mProcessor->LoadMetricsActivationFromDisk(); } void StatsService::Terminate() { |