diff options
| author | Bryce Lee <brycelee@google.com> | 2015-11-06 08:51:22 -0800 |
|---|---|---|
| committer | Bryce Lee <brycelee@google.com> | 2015-11-06 08:51:22 -0800 |
| commit | 88f900a518e2e5a21d39958793d2123962923172 (patch) | |
| tree | fc1103893f26d831562860ee7709fa8dea4ac9d0 | |
| parent | 7bab6651504422cddb01921e2d3220b801924bb0 (diff) | |
| download | android_packages_services_Telecomm-88f900a518e2e5a21d39958793d2123962923172.tar.gz android_packages_services_Telecomm-88f900a518e2e5a21d39958793d2123962923172.tar.bz2 android_packages_services_Telecomm-88f900a518e2e5a21d39958793d2123962923172.zip | |
Make rerouting audio to speaker when docked configurable.
Bug: 25485578
Change-Id: Ie2a04e9d96b9c1e3d8167679a1137b65bdad3379
| -rw-r--r-- | res/values/config.xml | 3 | ||||
| -rw-r--r-- | src/com/android/server/telecom/CallsManager.java | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index e474d7e9..af8cb523 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -42,4 +42,7 @@ <!-- Component name for the notification handler. The presence of this value will disable MissedCallNotifierImpl's presentation of missed call/voice notifications [DO NOT TRANSLATE] --> <string name="notification_component" translatable="false"></string> + + <!-- Flag indicating whether audio should be routed to speaker when docked --> + <bool name="use_speaker_when_docked">true</bool> </resources> diff --git a/src/com/android/server/telecom/CallsManager.java b/src/com/android/server/telecom/CallsManager.java index f3676e47..7204469f 100644 --- a/src/com/android/server/telecom/CallsManager.java +++ b/src/com/android/server/telecom/CallsManager.java @@ -712,7 +712,12 @@ public class CallsManager extends Call.ListenerBase implements VideoProviderProx } else { Log.i(this, "%s Starting with speakerphone because car is docked.", call); } - call.setStartWithSpeakerphoneOn(speakerphoneOn || mDockManager.isDocked()); + + final boolean useSpeakerWhenDocked = mContext.getResources().getBoolean( + R.bool.use_speaker_when_docked); + + call.setStartWithSpeakerphoneOn(speakerphoneOn + || (useSpeakerWhenDocked && mDockManager.isDocked())); if (call.isEmergencyCall()) { // Emergency -- CreateConnectionProcessor will choose accounts automatically |