diff options
| author | Eric Laurent <elaurent@google.com> | 2014-06-04 00:27:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-04 00:27:50 +0000 |
| commit | 8da213917ec58debffd91bbc64451b38361af428 (patch) | |
| tree | 2249dce6cf6991ea4973f99e8e680bf996f5369f /media | |
| parent | 4021b3ba74471b35e510543b765a2265eff9912a (diff) | |
| parent | b4e0909fc4fb08f513cb2b39a919b189621be87c (diff) | |
| download | frameworks_base-8da213917ec58debffd91bbc64451b38361af428.zip frameworks_base-8da213917ec58debffd91bbc64451b38361af428.tar.gz frameworks_base-8da213917ec58debffd91bbc64451b38361af428.tar.bz2 | |
Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/AudioManager.java | 12 | ||||
| -rw-r--r-- | media/java/android/media/AudioPort.java | 2 |
2 files changed, 5 insertions, 9 deletions
diff --git a/media/java/android/media/AudioManager.java b/media/java/android/media/AudioManager.java index 8ca303b..ce9fbb1 100644 --- a/media/java/android/media/AudioManager.java +++ b/media/java/android/media/AudioManager.java @@ -3184,15 +3184,11 @@ public class AudioManager { do { newPorts.clear(); status = AudioSystem.listAudioPorts(newPorts, portGeneration); - Log.i(TAG, "updateAudioPortCache AudioSystem.listAudioPorts() status: "+ - status+" num ports: "+ newPorts.size() +" portGeneration: "+portGeneration[0]); if (status != SUCCESS) { return status; } newPatches.clear(); status = AudioSystem.listAudioPatches(newPatches, patchGeneration); - Log.i(TAG, "updateAudioPortCache AudioSystem.listAudioPatches() status: "+ - status+" num patches: "+ newPatches.size() +" patchGeneration: "+patchGeneration[0]); if (status != SUCCESS) { return status; } @@ -3200,14 +3196,16 @@ public class AudioManager { for (int i = 0; i < newPatches.size(); i++) { for (int j = 0; j < newPatches.get(i).sources().length; j++) { - AudioPortConfig portCfg = updatePortConfig(newPatches.get(i).sources()[j], newPorts); + 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); + AudioPortConfig portCfg = updatePortConfig(newPatches.get(i).sinks()[j], + newPorts); if (portCfg == null) { return ERROR; } @@ -3238,8 +3236,6 @@ public class AudioManager { // compare handles because the port returned by JNI is not of the correct // subclass if (ports.get(k).handle().equals(port.handle())) { - Log.i(TAG, "updatePortConfig match found for port handle: "+ - port.handle().id()+" port: "+ k); port = ports.get(k); break; } diff --git a/media/java/android/media/AudioPort.java b/media/java/android/media/AudioPort.java index fbd5022..8b74842 100644 --- a/media/java/android/media/AudioPort.java +++ b/media/java/android/media/AudioPort.java @@ -133,7 +133,7 @@ public class AudioPort { * Get the gain descriptor at a given index */ AudioGain gain(int index) { - if (index < mGains.length) { + if (index < 0 || index >= mGains.length) { return null; } return mGains[index]; |