Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)" (ba7f0d2a) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+3 −3

Original line number	Diff line number	Diff line
		@@ -83,7 +83,7 @@ sp<SurfaceComposerClient> BootAnimation::session() const {
		void BootAnimation::binderDied(const wp<IBinder>& who)
		{
		// woah, surfaceflinger died!
		LOGD("SurfaceFlinger died, exiting...");
		ALOGD("SurfaceFlinger died, exiting...");

		// calling requestExit() is not enough here because the Surface code
		// might be blocked on a condition variable that will never be updated.
		@@ -394,13 +394,13 @@ bool BootAnimation::movie()
		int fps, width, height, count, pause;
		char path[256];
		if (sscanf(l, "%d %d %d", &width, &height, &fps) == 3) {
		//LOGD("> w=%d, h=%d, fps=%d", fps, width, height);
		//ALOGD("> w=%d, h=%d, fps=%d", fps, width, height);
		animation.width = width;
		animation.height = height;
		animation.fps = fps;
		}
		if (sscanf(l, "p %d %d %s", &count, &pause, path) == 3) {
		//LOGD("> count=%d, pause=%d, path=%s", count, pause, path);
		//ALOGD("> count=%d, pause=%d, path=%s", count, pause, path);
		Animation::Part part;
		part.count = count;
		part.pause = pause;

core/jni/ActivityManager.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ int openContentProviderFile(const String16& uri)
		}
		} else {
		// An exception was thrown back; fall through to return failure
		LOGD("openContentUri(%s) caught exception %d\n",
		ALOGD("openContentUri(%s) caught exception %d\n",
		String8(uri).string(), exceptionCode);
		}
		}

core/jni/AndroidRuntime.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -286,7 +286,7 @@ status_t AndroidRuntime::callMain(const char* className,
		JNIEnv* env;
		jmethodID methodId;

		LOGD("Calling main entry %s", className);
		ALOGD("Calling main entry %s", className);

		env = getJNIEnv();
		if (clazz == NULL \|\| env == NULL) {
		@@ -416,7 +416,7 @@ static void readLocale(char* language, char* region)
		}
		strncat(language, propLang, 2);
		strncat(region, propRegn, 2);
		//LOGD("language=%s region=%s\n", language, region);
		//ALOGD("language=%s region=%s\n", language, region);
		}

		/*
		@@ -629,7 +629,7 @@ int AndroidRuntime::startVm(JavaVM pJavaVM, JNIEnv pEnv)
		"-agentlib:jdwp=transport=dt_android_adb,suspend=n,server=y";
		mOptions.add(opt);

		LOGD("CheckJNI is %s\n", checkJni ? "ON" : "OFF");
		ALOGD("CheckJNI is %s\n", checkJni ? "ON" : "OFF");
		if (checkJni) {
		/* extended JNI checking */
		opt.optionString = "-Xcheck:jni";
		@@ -798,7 +798,7 @@ char* AndroidRuntime::toSlashClassName(const char* className)
		*/
		void AndroidRuntime::start(const char* className, const char* options)
		{
		LOGD("\n>>>>>> AndroidRuntime START %s <<<<<<\n",
		ALOGD("\n>>>>>> AndroidRuntime START %s <<<<<<\n",
		className != NULL ? className : "(unknown)");

		blockSigpipe();
		@@ -825,7 +825,7 @@ void AndroidRuntime::start(const char* className, const char* options)
		}

		//const char* kernelHack = getenv("LD_ASSUME_KERNEL");
		//LOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);
		//ALOGD("Found LD_ASSUME_KERNEL='%s'\n", kernelHack);

		/* start the virtual machine */
		JNIEnv* env;
		@@ -888,7 +888,7 @@ void AndroidRuntime::start(const char* className, const char* options)
		}
		free(slashClassName);

		LOGD("Shutting down VM\n");
		ALOGD("Shutting down VM\n");
		if (mJavaVM->DetachCurrentThread() != JNI_OK)
		LOGW("Warning: unable to detach main thread\n");
		if (mJavaVM->DestroyJavaVM() != 0)
		@@ -1064,7 +1064,7 @@ static int register_jni_procs(const RegJNIRec array[], size_t count, JNIEnv* env
		for (size_t i = 0; i < count; i++) {
		if (array[i].mProc(env) < 0) {
		#ifndef NDEBUG
		LOGD("----------!!! %s failed to load\n", array[i].mName);
		ALOGD("----------!!! %s failed to load\n", array[i].mName);
		#endif
		return -1;
		}

core/jni/android/graphics/Canvas.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -442,7 +442,7 @@ public:
		#endif
		canvas->drawPicture(*picture);
		#ifdef TIME_DRAW
		LOGD("---- picture playback %d ms\n", get_thread_msec() - now);
		ALOGD("---- picture playback %d ms\n", get_thread_msec() - now);
		#endif
		}

core/jni/android/graphics/HarfbuzzSkia.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@ static void glyphsToAdvances(HB_Font hbFont, const HB_Glyph* glyphs, hb_uint32 n
		for (unsigned i = 0; i < numGlyphs; ++i) {
		advances[i] = SkScalarToHBFixed(scalarAdvances[i]);
		#if DEBUG_ADVANCES
		LOGD("glyphsToAdvances -- advances[%d]=%d", i, advances[i]);
		ALOGD("glyphsToAdvances -- advances[%d]=%d", i, advances[i]);
		#endif
		}
		delete glyphs16;