audio policy: phone strategy routing based on preferred device API
Use preferred device API instead of forced usage to select
audio route for phone strategy in default audio policy engine.
Also remove use of forced usage for record which was redundant with
forced usage for communication (never used independently).
Bug: 161358428
Test: audio smoke tests
Change-Id: Ie0c36b69ae6849c6efe7b5602dc9d0322856f561
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 00c4eab..4e745bd 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -557,6 +557,11 @@
void updateCallAndOutputRouting(bool forceVolumeReeval = true, uint32_t delayMs = 0);
/**
+ * @brief updates routing for all inputs.
+ */
+ void updateInputRouting();
+
+ /**
* @brief checkOutputForAttributes checks and if necessary changes outputs used for the
* given audio attributes.
* must be called every time a condition that affects the output choice for a given
@@ -816,6 +821,10 @@
// The map of device descriptor and formats reported by the device.
std::map<wp<DeviceDescriptor>, FormatVector> mReportedFormatsMap;
+
+ // Cached product strategy ID corresponding to legacy strategy STRATEGY_PHONE
+ product_strategy_t mCommunnicationStrategy;
+
private:
void onNewAudioModulesAvailableInt(DeviceVector *newDevices);
@@ -971,6 +980,7 @@
std::function<bool(audio_devices_t)> predicate,
const char* context);
+ bool isScoRequestedForComm() const;
};
};