commit 2fe8d92a2bb38669ff19284446bc1a7d05a4aca2
author android-build-team Robot <android-build-team-robot@google.com> Wed Sep 13 01:04:39 2017 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Sep 13 01:04:39 2017 +0000
tree 34f6484abb85cfc9b4eed000c1812f1f63be5fdb
parent 51a9882b4f455db840432e040550a3dbd269db03
parent 122ec92c425ce898753d24edd4a43d634a630959

release-request-af601c83-5648-4021-963d-a59f2e12084d-for-git_oc-vts-release-4331727 snap-temp-L27900000101846630

Change-Id: I8491358ad0003c51dc9918025d9253a9bf3d9286

services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp

diff --git a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
index 1e63a05..2f7b1fb 100644
--- a/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
+++ b/services/audiopolicy/service/AudioPolicyInterfaceImpl.cpp
@@ -693,6 +693,7 @@
                                        audio_io_handle_t *ioHandle,
                                        audio_devices_t *device)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }
@@ -702,6 +703,7 @@
 
 status_t AudioPolicyService::releaseSoundTriggerSession(audio_session_t session)
 {
+    Mutex::Autolock _l(mLock);
     if (mAudioPolicyManager == NULL) {
         return NO_INIT;
     }

services/mediaanalytics/mediametrics.rc

diff --git a/services/mediaanalytics/mediametrics.rc b/services/mediaanalytics/mediametrics.rc
index 3829f8c..1efde5e 100644
--- a/services/mediaanalytics/mediametrics.rc
+++ b/services/mediaanalytics/mediametrics.rc
@@ -1,5 +1,6 @@
 service mediametrics /system/bin/mediametrics
     class main
     user media
+    group media
     ioprio rt 4
     writepid /dev/cpuset/foreground/tasks /dev/stune/foreground/tasks