From de709869ae10263c4c325aaa72cdc6aada0ae8d5 Mon Sep 17 00:00:00 2001
From: Jason Parks <jparks@google.com>
Date: Thu, 6 Nov 2014 14:08:52 -0600
Subject: [PATCH] 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
---
 media/java/android/media/audiofx/AudioEffect.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media/java/android/media/audiofx/AudioEffect.java b/media/java/android/media/audiofx/AudioEffect.java
index 9fa3f505bc353..a8b9686e8df98 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;