commit 90b530070ad49d49844fe82ab674b5f1093b80a6
author Eric Laurent <elaurent@google.com> Tue Oct 09 11:32:31 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 09 11:32:31 2012 -0700
tree 597eb98faaa99ad13b668f16c3ce8786b094ca49
parent 6c631f7a4d5b26d21059ae9ec58f84be1421f27e
parent 074f11c21da1f6897a750125e87cc478c0e983ee

am 074f11c2: am d22b2a1f: Merge "audio policy: add forced uses for system" into jb-mr1-dev

* commit '074f11c21da1f6897a750125e87cc478c0e983ee':
  audio policy: add forced uses for system

include/system/audio_policy.h

diff --git a/include/system/audio_policy.h b/include/system/audio_policy.h
index 7b82d8d..6b49a80 100644
--- a/include/system/audio_policy.h
+++ b/include/system/audio_policy.h
@@ -44,6 +44,7 @@
     AUDIO_POLICY_FORCE_DIGITAL_DOCK,
     AUDIO_POLICY_FORCE_NO_BT_A2DP, /* A2DP sink is not preferred to speaker or wired HS */
     AUDIO_POLICY_FORCE_REMOTE_SUBMIX,
+    AUDIO_POLICY_FORCE_SYSTEM_ENFORCED,
 
     AUDIO_POLICY_FORCE_CFG_CNT,
     AUDIO_POLICY_FORCE_CFG_MAX = AUDIO_POLICY_FORCE_CFG_CNT - 1,
@@ -57,6 +58,7 @@
     AUDIO_POLICY_FORCE_FOR_MEDIA,
     AUDIO_POLICY_FORCE_FOR_RECORD,
     AUDIO_POLICY_FORCE_FOR_DOCK,
+    AUDIO_POLICY_FORCE_FOR_SYSTEM,
 
     AUDIO_POLICY_FORCE_USE_CNT,
     AUDIO_POLICY_FORCE_USE_MAX = AUDIO_POLICY_FORCE_USE_CNT - 1,