diff options
| author | Jason Parks <jparks@google.com> | 2014-11-06 14:08:52 -0600 |
|---|---|---|
| committer | Jason Parks <jparks@google.com> | 2014-11-06 14:08:52 -0600 |
| commit | de709869ae10263c4c325aaa72cdc6aada0ae8d5 (patch) | |
| tree | e558898acf7006a3fe475a83aec375285f332747 | |
| parent | 61a76f2d7919cd6375cf4463b8bd69a608057d93 (diff) | |
| download | frameworks_base-de709869ae10263c4c325aaa72cdc6aada0ae8d5.zip frameworks_base-de709869ae10263c4c325aaa72cdc6aada0ae8d5.tar.gz frameworks_base-de709869ae10263c4c325aaa72cdc6aada0ae8d5.tar.bz2 | |
Fix NPE for CTS.
The effect list can be empty and will return null
from native code. This fixes the CTS crash.
Bug: 18256010
Change-Id: Ifa552efc9de216993427115c001c7071c90403f1
| -rw-r--r-- | media/java/android/media/audiofx/AudioEffect.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java index 9fa3f50..a8b9686 100644 --- a/media/java/android/media/audiofx/AudioEffect.java +++ b/media/java/android/media/audiofx/AudioEffect.java @@ -483,6 +483,10 @@ public class AudioEffect { */ public static boolean isEffectTypeAvailable(UUID type) { AudioEffect.Descriptor[] desc = AudioEffect.queryEffects(); + if (desc == null) { + return false; + } + for (int i = 0; i < desc.length; i++) { if (desc[i].type.equals(type)) { return true; |