| commit | 762cf9d08b4cdc1c99733dd69d943f6bcd7817e0 | [log] [tgz] |
|---|---|---|
| author | Anubhav Phukan <anubhavp@codeaurora.org> | Wed Apr 11 18:14:02 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 11 18:14:02 2018 -0700 |
| tree | 96c0ab4c36f11452b2f9c351b8d53cd1a9964f23 | |
| parent | 1baeb9c3e60e12ae71e4a4eeb7b7663eb615b6b3 [diff] | |
| parent | b856955f27ca4ae146e940ab8a4ababab04d8e35 [diff] |
Merge "media: Print stats when application stops playback" into pi-dev am: b856955f27 Change-Id: I36ecf9c56532eb554abbcd3b66f09fdd2b1a0681
diff --git a/camera/ndk/include/camera/NdkCameraMetadata.h b/camera/ndk/include/camera/NdkCameraMetadata.h index f2aec98..bdb1587 100644 --- a/camera/ndk/include/camera/NdkCameraMetadata.h +++ b/camera/ndk/include/camera/NdkCameraMetadata.h
@@ -36,6 +36,7 @@ #ifndef _NDK_CAMERA_METADATA_H #define _NDK_CAMERA_METADATA_H +#include <stdint.h> #include <sys/cdefs.h> #include "NdkCameraError.h"
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index 29ec961..256ef6a 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -1271,6 +1271,11 @@ setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc); } + if (stream == AUDIO_STREAM_ENFORCED_AUDIBLE && + mEngine->getForceUse(AUDIO_POLICY_FORCE_FOR_SYSTEM) == AUDIO_POLICY_FORCE_SYSTEM_ENFORCED) { + setStrategyMute(STRATEGY_SONIFICATION, true, outputDesc); + } + return NO_ERROR; }