commit 2392e6d96d80c44a140a3ab5c45a17b48d8216c1
author George Burgess IV <gbiv@google.com> Fri Oct 18 12:15:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 18 12:15:02 2019 -0700
tree 00aa74acf6c5e9c9cb162d370b8d7f5d5e225f92
parent e2d53408222d3b06462073b9447529c781be6419
parent cb1077dfa66e46ab6f43ba218d879e937700598d

Merge "libmediadrm: fix a use of an uninit value" am: 3ba521f0ba am: 87e6db673a am: 544847bc34
am: cb1077dfa6

Change-Id: I219a8977b9d14a0f7de247676e7b3f259f8cffc1

drm/libmediadrm/DrmHal.cpp

diff --git a/drm/libmediadrm/DrmHal.cpp b/drm/libmediadrm/DrmHal.cpp
index bd4b521..37609eb 100644
--- a/drm/libmediadrm/DrmHal.cpp
+++ b/drm/libmediadrm/DrmHal.cpp
@@ -899,9 +899,8 @@
 status_t DrmHal::provideKeyResponse(Vector<uint8_t> const &sessionId,
         Vector<uint8_t> const &response, Vector<uint8_t> &keySetId) {
     Mutex::Autolock autoLock(mLock);
-    EventTimer<status_t> keyResponseTimer(&mMetrics.mProvideKeyResponseTimeUs);
-
     INIT_CHECK();
+    EventTimer<status_t> keyResponseTimer(&mMetrics.mProvideKeyResponseTimeUs);
 
     DrmSessionManager::Instance()->useSession(sessionId);