commit 29709b726f9da90553508aaebff832d8e4346f8d
author Ray Essick <essick@google.com> Tue Oct 06 02:16:02 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Oct 06 02:16:02 2020 +0000
tree ed4560c67cc91961854bc70df7a61b466bd05ce4
parent 2e4311e57cb5debf86ff7e7fb4850a2c741a13cb
parent 8e4dd95f57ac2f3e675527ec7c77977889dc3cb3

Move an orphaned analytics reference under a mutex am: 8e4dd95f57

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

Change-Id: Ic037f757f4b62adc0a2c86afcdb7865c9d7896e6

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());