commit 8e4dd95f57ac2f3e675527ec7c77977889dc3cb3
author Ray Essick <essick@google.com> Thu Oct 01 12:09:00 2020 -0700
committer Ray Essick <essick@google.com> Thu Oct 01 12:41:45 2020 -0700
tree 9e1a0e289892392b69cb1351ce80b3d33610224c
parent 93b9203615ffb7fddd9fa8f412d5284b00a7ed18

Move an orphaned analytics reference under a mutex

Bug: 167695677
Bug: 151644303
Test: poc from bugs
Merged-In: I75f29a6254c5eab5d4f524ee7a7ef59f93a0b405
Change-Id: I0a5a532e9e96baf95efc2b82dba07adc7baf4930

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
index 3f34046..000881b 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp
@@ -553,7 +553,6 @@
     // getDuration() uses mLock
     int duration_ms = -1;
     getDuration(&duration_ms);
-    mAnalyticsItem->setInt64(kPlayerDuration, duration_ms);
 
     mPlayer->updateInternalTimers();
 
@@ -575,13 +574,14 @@
     // we also avoid any races within mAnalyticsItem machinery
     Mutex::Autolock autoLock(mMetricsLock);
 
+    mAnalyticsItem->setInt64(kPlayerDuration, duration_ms);
+
     mAnalyticsItem->setInt64(kPlayerPlaying, (playingTimeUs+500)/1000 );
 
     if (mRebufferingEvents != 0) {
         mAnalyticsItem->setInt64(kPlayerRebuffering, (rebufferingTimeUs+500)/1000 );
         mAnalyticsItem->setInt32(kPlayerRebufferingCount, rebufferingEvents);
         mAnalyticsItem->setInt32(kPlayerRebufferingAtExit, rebufferingAtExit);
-
      }
 
     mAnalyticsItem->setCString(kPlayerDataSourceType, mPlayer->getDataSourceType());