commit e26a1c248f7149118334839fe32ecd57f1fa926e
author Dhananjay Kumar <dhakumar@codeaurora.org> Tue Apr 07 14:23:13 2015 +0530
committer Eric Laurent <elaurent@google.com> Tue Apr 07 23:59:53 2015 +0000
tree 38d963f2c61444b32a9789e99a6cd4ec1238ac9c
parent 4f33aa31c5cc96bfb7abca4ad1c8f6f8c04e46af

DO NOT MERGE - [FM] Fallback if createAudioPatch fails

CreatePatch returns error if a port is connected to
an output device on a hal version less than 3.0.
Hence on error fallback same path for
HEADSET/Headphone as is implemented for speaker.

Bug: 20104423.

Change-Id: I7f165849038cb867ce6799777e92052ced147ef4
(cherry picked from commit 19ca9f8472208d429eff4e5c736d3084eb712b17)

src/com/android/fmradio/FmService.java

diff --git a/src/com/android/fmradio/FmService.java b/src/com/android/fmradio/FmService.java
index 35efe56..21a36b8 100644
--- a/src/com/android/fmradio/FmService.java
+++ b/src/com/android/fmradio/FmService.java
@@ -390,9 +390,13 @@
        // because input/output device may be changed.
        if (mAudioRecord != null) {
            mAudioRecord.stop();
+           mAudioRecord.release();
+           mAudioRecord = null;
        }
        if (mAudioTrack != null) {
            mAudioTrack.stop();
+           mAudioTrack.release();
+           mAudioTrack = null;
        }
        initAudioRecordSink();
 
@@ -1284,11 +1288,12 @@
                 SAMPLE_RATE, CHANNEL_CONFIG, AUDIO_FORMAT, RECORD_BUF_SIZE, AudioTrack.MODE_STREAM);
     }
 
-    private synchronized void createAudioPatch() {
+    private synchronized int createAudioPatch() {
         Log.d(TAG, "createAudioPatch");
+        int status = AudioManager.SUCCESS;
         if (mAudioPatch != null) {
             Log.d(TAG, "createAudioPatch, mAudioPatch is not null, return");
-            return;
+            return status;
         }
 
         mAudioSource = null;
@@ -1312,11 +1317,12 @@
                     .activeConfig();
             AudioDevicePortConfig sinkConfig = (AudioDevicePortConfig) mAudioSink.activeConfig();
             AudioPatch[] audioPatchArray = new AudioPatch[] {null};
-            mAudioManager.createAudioPatch(audioPatchArray,
+            status = mAudioManager.createAudioPatch(audioPatchArray,
                     new AudioPortConfig[] {sourceConfig},
                     new AudioPortConfig[] {sinkConfig});
             mAudioPatch = audioPatchArray[0];
         }
+        return status;
     }
 
     private FmOnAudioPortUpdateListener mAudioPortUpdateListener = null;
@@ -1369,9 +1375,14 @@
                 ArrayList<AudioPatch> patches = new ArrayList<AudioPatch>();
                 mAudioManager.listAudioPatches(patches);
                 if (isPatchMixerToEarphone(patches)) {
+                    int status;
                     stopAudioTrack();
                     stopRender();
-                    createAudioPatch();
+                    status = createAudioPatch();
+                    if (status != AudioManager.SUCCESS){
+                       Log.d(TAG, "onAudioPatchListUpdate: fallback as createAudioPatch failed");
+                       startRender();
+                    }
                 }
             }
         }
@@ -1645,9 +1656,14 @@
             mAudioManager.listAudioPatches(patches);
             if (mAudioPatch == null) {
                 if (isPatchMixerToEarphone(patches)) {
+                    int status;
                     stopAudioTrack();
                     stopRender();
-                    createAudioPatch();
+                    status = createAudioPatch();
+                    if (status != AudioManager.SUCCESS){
+                       Log.d(TAG, "enableFmAudio: fallback as createAudioPatch failed");
+                       startRender();
+                    }
                 } else {
                     startRender();
                 }