commit 5d3f2d1e104ffc9133afd4f2befe8f2cff9797db
author Andy Hung <hunga@google.com> Wed Mar 04 19:55:03 2020 -0800
committer Andy Hung <hunga@google.com> Thu Mar 05 16:32:07 2020 -0800
tree b4b4b0bcfa5d20d781ab441198700cbae25f879e
parent 084b328e1cf091a9eedda20ee92a41be3bdc978e

MediaMetrics: Garbage collection fixes

1) Correct TransactionLog low water mark
2) Limit number of items historically stored in any TimeMachine property.

Test: Special instrumented atest
Bug: 150547711
Bug: 150598686
Change-Id: I67b25c84b1fb62ce83caa5ec48b800cab85467c9

services/mediametrics/MediaMetricsService.cpp

diff --git a/services/mediametrics/MediaMetricsService.cpp b/services/mediametrics/MediaMetricsService.cpp
index 811e135..d27fa5e 100644
--- a/services/mediametrics/MediaMetricsService.cpp
+++ b/services/mediametrics/MediaMetricsService.cpp
@@ -113,6 +113,7 @@
     case AID_MEDIA_CODEC:
     case AID_MEDIA_EX:
     case AID_MEDIA_DRM:
+    // case AID_SHELL: // DEBUG ONLY - used for mediametrics_tests to add new keys
     case AID_SYSTEM:
         // trusted source, only override default values
         isTrusted = true;
@@ -145,9 +146,10 @@
         }
     }
 
-    ALOGV("%s: given uid %d; sanitized uid: %d sanitized pkg: %s "
+    ALOGV("%s: isTrusted:%d given uid %d; sanitized uid: %d sanitized pkg: %s "
           "sanitized pkg version: %lld",
           __func__,
+          (int)isTrusted,
           uid_given, item->getUid(),
           item->getPkgName().c_str(),
           (long long)item->getPkgVersionCode());