Merge 4ea040c03215b634baf23cd696f706d6110d72c6 on remote branch

Change-Id: I8b22c4bf30fd3e937d4f138e6a354f3e36ee4409
diff --git a/fmapp2/src/com/caf/fmradio/FMRadioService.java b/fmapp2/src/com/caf/fmradio/FMRadioService.java
index ce39f38..d25e5a8 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -752,7 +752,7 @@
     final Runnable    mFmVolumeHandler = new Runnable() {
         public void run() {
             try {
-                Thread.sleep(1000);
+                Thread.sleep(1500);
             } catch (Exception ex) {
                 Log.d( LOGTAG, "RunningThread InterruptedException");
                 return;
@@ -1512,7 +1512,10 @@
                mMuted = bTempMute;
            }
        } else if (TelephonyManager.CALL_STATE_IDLE == state) {
-           resumeAfterCall();
+           /* do not resume FM after call when fm stopped on focus loss */
+           if(mStoppedOnFocusLoss == false) {
+               resumeAfterCall();
+           }
        }
    }