am 220b65d2: am 94c3e3bf: Merge "Fix NPE for CTS." into lmp-sprout-dev

* commit '220b65d21dcb332b9bb39e2c75a5adba5d7c73d9': Fix NPE for CTS.
2014-11-07 00:13:57 +00:00
parent 2140dc7e45 220b65d21d
commit ae61ea936a
1 changed files with 4 additions and 0 deletions
--- 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;