Merge "audio: Fix NULL check" (9f5f78af) · Commits · e / os / android_frameworks_base

core/jni/android_media_AudioAttributes.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -154,7 +154,7 @@ jint JNIAudioAttributeHelper::getJavaArray(
	JNIEnv* env, jobjectArray *jAudioAttributeArray, jint numAudioAttributes)		JNIEnv* env, jobjectArray *jAudioAttributeArray, jint numAudioAttributes)
	{		{
	*jAudioAttributeArray = env->NewObjectArray(numAudioAttributes, gAudioAttributesClass, NULL);		*jAudioAttributeArray = env->NewObjectArray(numAudioAttributes, gAudioAttributesClass, NULL);
	return jAudioAttributeArray == NULL? (jint)AUDIO_JAVA_ERROR : (jint)AUDIO_JAVA_SUCCESS;		return *jAudioAttributeArray == NULL? (jint)AUDIO_JAVA_ERROR : (jint)AUDIO_JAVA_SUCCESS;
	}		}

	/*		/*