Merge "No newline or space at end of ALOG format string" (5dd4754f) · Commits · e / os / android_frameworks_base

core/jni/android_media_ToneGenerator.cpp

+12 −12

Original line number	Diff line number	Diff line
		@@ -39,7 +39,7 @@ struct fields_t {
		static fields_t fields;

		static jboolean android_media_ToneGenerator_startTone(JNIEnv *env, jobject thiz, jint toneType, jint durationMs) {
		ALOGV("android_media_ToneGenerator_startTone: %x\n", (int)thiz);
		ALOGV("android_media_ToneGenerator_startTone: %x", (int)thiz);

		ToneGenerator lpToneGen = (ToneGenerator )env->GetIntField(thiz,
		fields.context);
		@@ -52,12 +52,12 @@ static jboolean android_media_ToneGenerator_startTone(JNIEnv *env, jobject thiz,
		}

		static void android_media_ToneGenerator_stopTone(JNIEnv *env, jobject thiz) {
		ALOGV("android_media_ToneGenerator_stopTone: %x\n", (int)thiz);
		ALOGV("android_media_ToneGenerator_stopTone: %x", (int)thiz);

		ToneGenerator lpToneGen = (ToneGenerator )env->GetIntField(thiz,
		fields.context);

		ALOGV("ToneGenerator lpToneGen: %x\n", (unsigned int)lpToneGen);
		ALOGV("ToneGenerator lpToneGen: %x", (unsigned int)lpToneGen);
		if (lpToneGen == NULL) {
		jniThrowRuntimeException(env, "Method called after release()");
		return;
		@@ -68,7 +68,7 @@ static void android_media_ToneGenerator_stopTone(JNIEnv *env, jobject thiz) {
		static void android_media_ToneGenerator_release(JNIEnv *env, jobject thiz) {
		ToneGenerator lpToneGen = (ToneGenerator )env->GetIntField(thiz,
		fields.context);
		ALOGV("android_media_ToneGenerator_release lpToneGen: %x\n", (int)lpToneGen);
		ALOGV("android_media_ToneGenerator_release lpToneGen: %x", (int)lpToneGen);

		env->SetIntField(thiz, fields.context, 0);

		@@ -83,17 +83,17 @@ static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz,

		env->SetIntField(thiz, fields.context, 0);

		ALOGV("android_media_ToneGenerator_native_setup jobject: %x\n", (int)thiz);
		ALOGV("android_media_ToneGenerator_native_setup jobject: %x", (int)thiz);

		if (lpToneGen == NULL) {
		ALOGE("ToneGenerator creation failed \n");
		ALOGE("ToneGenerator creation failed");
		jniThrowException(env, "java/lang/OutOfMemoryError", NULL);
		return;
		}
		ALOGV("ToneGenerator lpToneGen: %x\n", (unsigned int)lpToneGen);
		ALOGV("ToneGenerator lpToneGen: %x", (unsigned int)lpToneGen);

		if (!lpToneGen->isInited()) {
		ALOGE("ToneGenerator init failed \n");
		ALOGE("ToneGenerator init failed");
		jniThrowRuntimeException(env, "Init failed");
		return;
		}
		@@ -101,18 +101,18 @@ static void android_media_ToneGenerator_native_setup(JNIEnv *env, jobject thiz,
		// Stow our new C++ ToneGenerator in an opaque field in the Java object.
		env->SetIntField(thiz, fields.context, (int)lpToneGen);

		ALOGV("ToneGenerator fields.context: %x\n", env->GetIntField(thiz, fields.context));
		ALOGV("ToneGenerator fields.context: %x", env->GetIntField(thiz, fields.context));
		}

		static void android_media_ToneGenerator_native_finalize(JNIEnv *env,
		jobject thiz) {
		ALOGV("android_media_ToneGenerator_native_finalize jobject: %x\n", (int)thiz);
		ALOGV("android_media_ToneGenerator_native_finalize jobject: %x", (int)thiz);

		ToneGenerator lpToneGen = (ToneGenerator )env->GetIntField(thiz,
		fields.context);

		if (lpToneGen) {
		ALOGV("delete lpToneGen: %x\n", (int)lpToneGen);
		if (lpToneGen != NULL) {
		ALOGV("delete lpToneGen: %p", lpToneGen);
		delete lpToneGen;
		}
		}

media/libmedia/AudioEffect.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -159,7 +159,7 @@ status_t AudioEffect::set(const effect_uuid_t *type,
		mCblk->buffer = (uint8_t *)mCblk + bufOffset;

		iEffect->asBinder()->linkToDeath(mIEffectClient);
		ALOGV("set() %p OK effect: %s id: %d status %d enabled %d, ", this, mDescriptor.name, mId, mStatus, mEnabled);
		ALOGV("set() %p OK effect: %s id: %d status %d enabled %d", this, mDescriptor.name, mId, mStatus, mEnabled);

		return mStatus;
		}

media/libmedia/MediaProfiles.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -349,7 +349,7 @@ void MediaProfiles::addImageEncodingQualityLevel(int cameraId, const char** atts
		{
		CHECK(!strcmp("quality", atts[0]));
		int quality = atoi(atts[1]);
		ALOGV("%s: cameraId=%d, quality=%d\n", __func__, cameraId, quality);
		ALOGV("%s: cameraId=%d, quality=%d", __func__, cameraId, quality);
		ImageEncodingQualityLevels *levels = findImageEncodingQualityLevels(cameraId);

		if (levels == NULL) {

media/libmedia/MediaScanner.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -143,7 +143,7 @@ MediaScanResult MediaScanner::doProcessDirectory(
		if (pathRemaining >= 8 /* strlen(".nomedia") */ ) {
		strcpy(fileSpot, ".nomedia");
		if (access(path, F_OK) == 0) {
		ALOGV("found .nomedia, setting noMedia flag\n");
		ALOGV("found .nomedia, setting noMedia flag");
		noMedia = true;
		}

media/libmedia/MediaScannerClient.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -142,12 +142,12 @@ void MediaScannerClient::convertValues(uint32_t encoding)

		UConverter *conv = ucnv_open(enc, &status);
		if (U_FAILURE(status)) {
		ALOGE("could not create UConverter for %s\n", enc);
		ALOGE("could not create UConverter for %s", enc);
		return;
		}
		UConverter *utf8Conv = ucnv_open("UTF-8", &status);
		if (U_FAILURE(status)) {
		ALOGE("could not create UConverter for UTF-8\n");
		ALOGE("could not create UConverter for UTF-8");
		ucnv_close(conv);
		return;
		}
		@@ -181,7 +181,7 @@ void MediaScannerClient::convertValues(uint32_t encoding)
		ucnv_convertEx(utf8Conv, conv, &target, target + targetLength,
		&source, (const char *)dest, NULL, NULL, NULL, NULL, TRUE, TRUE, &status);
		if (U_FAILURE(status)) {
		ALOGE("ucnv_convertEx failed: %d\n", status);
		ALOGE("ucnv_convertEx failed: %d", status);
		mValues->setEntry(i, "???");
		} else {
		// zero terminate