| commit | 1baeb9c3e60e12ae71e4a4eeb7b7663eb615b6b3 | [log] [tgz] |
|---|---|---|
| author | Kevin Rocard <krocard@google.com> | Wed Apr 11 17:24:34 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Apr 11 17:24:34 2018 -0700 |
| tree | f3dd8a29ff916be9d95904d491d437ac52572f09 | |
| parent | 5ce978a6f503e72d529665b2acf9ba0011e4cbda [diff] | |
| parent | c1428baf1badc3e5ea817d6266f42b2719374ed2 [diff] |
Merge changes I53055724,I06914911 into pi-dev am: c1428baf1b Change-Id: I87124972884cc8aafa51d346ba97ff2895514dc9
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; }