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

* commit '94c3e3bfcfe8d91283560082c737cb62e8d06742': Fix NPE for CTS.
2014-11-07 00:05:47 +00:00
parent c02d9a73e3 94c3e3bfcf
commit 220b65d21d
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;