Promotion of fm.lnx.2.1-00006.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1047328   Ic9b0bad141a8d5d88e6b9b93350a5b02961b91db   Fix: Can't control Alarm/Ring volume after plugout heads

Change-Id: I8a8c6252d328c86cd6c03157844d6715bb766555
CRs-Fixed: 1047328
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 9546cd3..2b9fb83 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -652,7 +652,8 @@
                             mA2dpDisconnected = false;
                             mA2dpConnected = true;
                         }
-                        configureAudioDataPath(true);
+                        if (isFmOn())
+                            configureAudioDataPath(true);
                     } else if (action.equals("HDMI_CONNECTED")) {
                         //FM should be off when HDMI is connected.
                         fmOff();