commit cd9ddcdbf3ae0b8936f107ed82ba8fe6409a5c1f
author Kamal Negi <kamaln@codeaurora.org> Mon Mar 13 18:01:03 2017 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 21 03:15:47 2017 -0700
tree b5a86e7da41e869969eabbd398e21092c6147bfa
parent 7a8bc3ff334662d297d2e18393df8f7024389c7c

fm: Resume FM after telephony state become idle

On call disconnection, AUDIOFOCUS_GAIN received before telephony state
intent and telephony state update happens after audio focus gain. Hence
FM turn on won't happen.
Turn on FM if telephony intent received or rety once after
100ms.

Change-Id: I6bdc7f13afd024be8d3428c83f7117277affc45f

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 2d157c6..6588571 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadioService.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadioService.java
@@ -1449,31 +1449,33 @@
        resolver.insert(uri, values);
    }
 
-    private void resumeAfterCall() {
-        if (getCallState() != TelephonyManager.CALL_STATE_IDLE)
-            return;
-
-        // start playing again
-        if (!mResumeAfterCall)
-            return;
-
-        // resume playback only if FM Radio was playing
-        // when the call was answered
-        if (isAntennaAvailable() && (!isFmOn()) && mServiceInUse) {
-            Log.d(LOGTAG, "Resuming after call:");
-            if(!fmOn()) {
+   Runnable resumeAfterCall = new Runnable() {
+        public void run() {
+            if (getCallState() != TelephonyManager.CALL_STATE_IDLE)
                 return;
-            }
-            mResumeAfterCall = false;
-            if (mCallbacks != null) {
-                try {
-                    mCallbacks.onEnabled();
-                } catch (RemoteException e) {
-                    e.printStackTrace();
+
+            // start playing again
+            if (!mResumeAfterCall)
+                return;
+
+            // resume playback only if FM Radio was playing
+            // when the call was answered
+            if (isAntennaAvailable() && (!isFmOn()) && mServiceInUse) {
+                Log.d(LOGTAG, "Resuming after call:");
+                if(!fmOn()) {
+                    return;
+                }
+                mResumeAfterCall = false;
+                if (mCallbacks != null) {
+                    try {
+                        mCallbacks.onEnabled();
+                    } catch (RemoteException e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }
-    }
+    };
 
    private void fmActionOnCallState( int state ) {
    //if Call Status is non IDLE we need to Mute FM as well stop recording if
@@ -1623,7 +1625,11 @@
                       mStoppedOnFocusLoss = false;
                       if (mResumeAfterCall) {
                           Log.v(LOGTAG, "resumeAfterCall");
-                          resumeAfterCall();
+                          if (getCallState() != TelephonyManager.CALL_STATE_IDLE) {
+                              mHandler.postDelayed(resumeAfterCall, 100);
+                              return;
+                          }
+                          mHandler.post(resumeAfterCall);
                           break;
                       }
                       if(false == mPlaybackInProgress)