OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
61a76f2
)
Fix NPE for CTS.
author
Jason Parks
<jparks@google.com>
Thu, 6 Nov 2014 20:08:52 +0000
(14:08 -0600)
committer
Jason Parks
<jparks@google.com>
Thu, 6 Nov 2014 20:08:52 +0000
(14:08 -0600)
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
patch
|
blob
|
history
diff --git
a/media/java/android/media/audiofx/AudioEffect.java
b/media/java/android/media/audiofx/AudioEffect.java
index
9fa3f50
..
a8b9686
100644
(file)
--- 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;