Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49c2bc3a authored by Wonsik Kim's avatar Wonsik Kim Committed by Android Git Automerger
Browse files

am d7310bd1: Merge "audio: allow audio port cache update even when audio... 

am d7310bd1: Merge "audio: allow audio port cache update even when audio patches contain invalidated sources/sinks" into lmp-mr1-dev

* commit 'd7310bd1':
  audio: allow audio port cache update even when audio patches contain invalidated sources/sinks
parents 2e6eede4 d7310bd1

media/java/android/media/AudioManager.java

+24 −7
Original line number Diff line number Diff line
@@ -46,9 +46,9 @@ import android.provider.Settings; 
import android.util.Log;

import android.view.KeyEvent;



import java.util.HashMap;

import java.util.ArrayList;



import java.util.HashMap;

import java.util.Iterator;



/**

 * AudioManager provides access to volume and ringer mode control.
@@ -3650,11 +3650,13 @@ public class AudioManager { 
                    newPorts.clear();

                    status = AudioSystem.listAudioPorts(newPorts, portGeneration);

                    if (status != SUCCESS) {

                        Log.w(TAG, "updateAudioPortCache: listAudioPorts failed");

                        return status;

                    }

                    newPatches.clear();

                    status = AudioSystem.listAudioPatches(newPatches, patchGeneration);

                    if (status != SUCCESS) {

                        Log.w(TAG, "updateAudioPortCache: listAudioPatches failed");

                        return status;

                    }

                } while (patchGeneration[0] != portGeneration[0]);
@@ -3663,18 +3665,33 @@ public class AudioManager { 
                    for (int j = 0; j < newPatches.get(i).sources().length; j++) {

                        AudioPortConfig portCfg = updatePortConfig(newPatches.get(i).sources()[j],

                                                                   newPorts);

                        if (portCfg == null) {

                            return ERROR;

                        }

                        newPatches.get(i).sources()[j] = portCfg;

                    }

                    for (int j = 0; j < newPatches.get(i).sinks().length; j++) {

                        AudioPortConfig portCfg = updatePortConfig(newPatches.get(i).sinks()[j],

                                                                   newPorts);

                        newPatches.get(i).sinks()[j] = portCfg;

                    }

                }

                for (Iterator<AudioPatch> i = newPatches.iterator(); i.hasNext(); ) {

                    AudioPatch newPatch = i.next();

                    boolean hasInvalidPort = false;

                    for (AudioPortConfig portCfg : newPatch.sources()) {

                        if (portCfg == null) {

                            return ERROR;

                            hasInvalidPort = true;

                            break;

                        }

                        newPatches.get(i).sinks()[j] = portCfg;

                    }

                    for (AudioPortConfig portCfg : newPatch.sinks()) {

                        if (portCfg == null) {

                            hasInvalidPort = true;

                            break;

                        }

                    }

                    if (hasInvalidPort) {

                        // Temporarily remove patches with invalid ports. One who created the patch

                        // is responsible for dealing with the port change.

                        i.remove();

                    }

                }