hal: remote merge from master to LA.BR.1 branch
- Merge commit 'b87c2eeacfec214f198169319b11e4aca8ab8e87'
Conflicts:
hal/Android.mk
hal/audio_extn/audio_extn.c
hal/audio_extn/audio_extn.h
hal/audio_extn/dolby.c
hal/audio_hw.c
hal/msm8916/hw_info.c
hal/msm8916/platform.c
hal/msm8916/platform.h
hal/msm8974/platform.c
hal/platform_api.h
policy_hal/AudioPolicyManager.cpp
Change-Id: Ic9e8a18a5d82719b02038999c92c9991f843981b
diff --git a/hal/audio_extn/dolby.c b/hal/audio_extn/dolby.c
old mode 100755
new mode 100644
index a26063a..92ef4ac
--- a/hal/audio_extn/dolby.c
+++ b/hal/audio_extn/dolby.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.
* Not a Contribution.
*
* Copyright (C) 2010 The Android Open Source Project
@@ -609,6 +609,8 @@
property_get("audio.ds1.metainfo.key",value,"0");
#ifdef DOLBY_ACDB_LICENSE
key = atoi(value);
+#else
+ key = 0;
#endif
ALOGV("%s Setting DS1 License, key:0x%x",__func__, key);
ret = mixer_ctl_set_value(ctl, 0, key);