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

Merge "FM: Turn off FM after audio focus loss"

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 eb575c3..c53efbb 100644
--- a/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
+++ b/fmapp/src/com/codeaurora/fmradio/FMRadioService.java
@@ -1044,13 +1044,7 @@
                          mSpeakerDisableHandler.postDelayed(mSpeakerDisableTask, 0);
                       }
                       if (true == mPlaybackInProgress) {
-                          if (mMuted)
-                              unMute();
-                          stopFM();
-                      }
-                      if (mSpeakerPhoneOn) {
-                          if (isAnalogModeSupported())
-                              setAudioPath(false);
+                          fmOff();
                       }
                       mStoppedOnFocusLoss = true;
                       break;

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 6dcc4ae..106d1a6 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1041,13 +1041,7 @@
                          mSpeakerDisableHandler.postDelayed(mSpeakerDisableTask, 0);
                       }
                       if (true == mPlaybackInProgress) {
-                          if(mMuted)
-                             unMute();
-                          stopFM();
-                      }
-                      if (mSpeakerPhoneOn) {
-                          if (isAnalogModeSupported())
-                              setAudioPath(false);
+                          fmOff();
                       }
                       mStoppedOnFocusLoss = true;
                       break;