commit 7638ca29e8400a19524adb982e9d22c02786de82
author Jean-Michel Trivi <jmtrivi@google.com> Fri Mar 04 17:42:44 2016 -0800
committer Jean-Michel Trivi <jmtrivi@google.com> Wed Mar 16 14:28:09 2016 -0700
tree 5d1ef493f79529cd5d5a1cce932c6dec3e5d8e69
parent 9515aca0c07a32128a65a68749bda3ea6851c109

Dynamic policies: support for device selection

Dynamic policy mix: rename "registration" field to device address
  as this reflects the true use of the field.
AudioPolicyManager: dynamic policy registration differs depending
  on policy routing flags.
When register a mix with the RENDER flag, iterate over all outputs'
  patches to find a matching device and address.

Bug 25448664

Change-Id: I71584081e7f1b2b5252fb6c4659fdeb464f7d282

include/media/AudioPolicy.h

diff --git a/include/media/AudioPolicy.h b/include/media/AudioPolicy.h
index c769a62..8528c7a 100644
--- a/include/media/AudioPolicy.h
+++ b/include/media/AudioPolicy.h
@@ -51,6 +51,7 @@
 
 #define MIX_ROUTE_FLAG_RENDER 0x1
 #define MIX_ROUTE_FLAG_LOOP_BACK (0x1 << 1)
+#define MIX_ROUTE_FLAG_ALL (MIX_ROUTE_FLAG_RENDER | MIX_ROUTE_FLAG_LOOP_BACK)
 
 #define MAX_MIXES_PER_POLICY 10
 #define MAX_CRITERIA_PER_MIX 20
@@ -81,7 +82,7 @@
     AudioMix(Vector<AudioMixMatchCriterion> criteria, uint32_t mixType, audio_config_t format,
              uint32_t routeFlags, String8 registrationId, uint32_t flags) :
         mCriteria(criteria), mMixType(mixType), mFormat(format),
-        mRouteFlags(routeFlags), mRegistrationId(registrationId), mCbFlags(flags){}
+        mRouteFlags(routeFlags), mDeviceAddress(registrationId), mCbFlags(flags){}
 
     status_t readFromParcel(Parcel *parcel);
     status_t writeToParcel(Parcel *parcel) const;
@@ -90,7 +91,8 @@
     uint32_t        mMixType;
     audio_config_t  mFormat;
     uint32_t        mRouteFlags;
-    String8         mRegistrationId;
+    audio_devices_t mDeviceType;
+    String8         mDeviceAddress;
     uint32_t        mCbFlags; // flags indicating which callbacks to use, see kCbFlag*
 };