summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRupesh Tatiya <rtatiya@codeaurora.org>2016-03-30 14:49:39 +0530
committerAbhisek Devkota <ciwrl@cyanogenmod.com>2016-04-19 20:40:21 -0700
commitee0b89eca72fca1abe795668835d2f5253f6f021 (patch)
treec83268184a063c97e9627b419ae1ce86e00dbf4a
parent2f5edee0cb5b4ee9cc09b44e77509fa2a5ecfd92 (diff)
downloadandroid_hardware_qcom_fm-ee0b89eca72fca1abe795668835d2f5253f6f021.tar.gz
android_hardware_qcom_fm-ee0b89eca72fca1abe795668835d2f5253f6f021.tar.bz2
android_hardware_qcom_fm-ee0b89eca72fca1abe795668835d2f5253f6f021.zip
Route audio to connected A2DP headset on turn on.
If BT is connected after FM app launch and then FM is turned off and then turned on, audio gets routed to wired headset. Check if A2DP device is connected every time FM is turned on. Also set the UI icon to correct image. CRs-Fixed: 996689 Change-Id: I7314075f1652a1b99b906b674a98dfc12179e9cf
-rw-r--r--fmapp2/src/com/caf/fmradio/FMRadio.java2
-rw-r--r--fmapp2/src/com/caf/fmradio/FMRadioService.java5
2 files changed, 6 insertions, 1 deletions
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index 5009286..cc8f1e9 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -2288,7 +2288,7 @@ public class FMRadio extends Activity
}
private void A2DPConnectionState(boolean state) {
- Log.d(LOGTAG, "A2DPConnectionState with:" +state);
+ Log.d(LOGTAG, "A2DPConnectionState with: " + state);
if (state) {
Log.d(LOGTAG, "A2DP connected, set button to speaker");
mSpeakerButton.setImageResource(R.drawable.btn_speaker);
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 7421d8e..889e69b 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1070,7 +1070,12 @@ public class FMRadioService extends Service
Log.d(LOGTAG, "Audio source set it as headset");
AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_NONE);
}
+ } else {
+ Log.d(LOGTAG, "A2DP is connected, set audio source to A2DP HS");
+ AudioSystem.setForceUse(AudioSystem.FOR_MEDIA, AudioSystem.FORCE_SPEAKER);
+ mSpeakerPhoneOn = true;
}
+
mPlaybackInProgress = true;
configureAudioDataPath(true);
try {