commit a1e94f8dd88eca2389fad4d74a57ff2f094eddcf
author Linux Build Service Account <lnxbuild@localhost> Fri Sep 06 11:09:11 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Sep 06 11:09:11 2013 -0700
tree f5fe00f4e9b42d34ed414066f2c0cdbed755bcea
parent aa8b1849f9feccf689c6cf825e07c65a7cc63348
parent c0f384cff75ca545d09d43255f0db19b1230cd68

Merge "FM: Check the headset status before turning ON FM."

fmapp/src/com/codeaurora/fmradio/FMRadioService.java

diff --git a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
index c53efbb..4505e9f 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
@@ -473,7 +473,7 @@
                                  }
                                  break;
                              case KeyEvent.KEYCODE_MEDIA_PLAY:
-                                 if (mServiceInUse ) {
+                                 if (isAntennaAvailable() && mServiceInUse ) {
                                      fmOn();
                                      if (isOrderedBroadcast()) {
                                          abortBroadcast();

fmapp2/src/com/caf/fmradio/FMRadioService.java

diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index 106d1a6..a73047a 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -470,7 +470,7 @@
                                  }
                                  break;
                              case KeyEvent.KEYCODE_MEDIA_PLAY:
-                                 if (mServiceInUse ) {
+                                 if (isAntennaAvailable() && mServiceInUse) {
                                      fmOn();
                                      if (isOrderedBroadcast()) {
                                          abortBroadcast();