Merge "Add additional logs for bootanimation" (51a49540) · Commits · e / os / android_frameworks_base

cmds/bootanimation/BootAnimation.cpp

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -764,6 +764,7 @@ bool BootAnimation::threadLoop() {
	// We have no bootanimation file, so we use the stock android logo		// We have no bootanimation file, so we use the stock android logo
	// animation.		// animation.
	if (mZipFileName.isEmpty()) {		if (mZipFileName.isEmpty()) {
			ALOGD("No animation file");
	result = android();		result = android();
	} else {		} else {
	result = movie();		result = movie();
	@@ -1474,6 +1475,10 @@ bool BootAnimation::playAnimation(const Animation& animation) {
	part.backgroundColor[2],		part.backgroundColor[2],
	1.0f);		1.0f);

			ALOGD("Playing files = %s/%s, Requested repeat = %d, playUntilComplete = %s",
			animation.fileName.string(), part.path.string(), part.count,
			part.playUntilComplete ? "true" : "false");

	// For the last animation, if we have progress indicator from		// For the last animation, if we have progress indicator from
	// the system, display it.		// the system, display it.
	int currentProgress = android::base::GetIntProperty(PROGRESS_PROP_NAME, 0);		int currentProgress = android::base::GetIntProperty(PROGRESS_PROP_NAME, 0);
	@@ -1607,6 +1612,9 @@ bool BootAnimation::playAnimation(const Animation& animation) {
	}		}
	}		}

			ALOGD("%sAnimationShownTiming End time: %" PRId64 "ms", mShuttingDown ? "Shutdown" : "Boot",
			elapsedRealtime());

	return true;		return true;
	}		}

	@@ -1682,6 +1690,8 @@ BootAnimation::Animation* BootAnimation::loadAnimation(const String8& fn) {
	return nullptr;		return nullptr;
	}		}

			ALOGD("%s is loaded successfully", fn.string());

	Animation *animation = new Animation;		Animation *animation = new Animation;
	animation->fileName = fn;		animation->fileName = fn;
	animation->zip = zip;		animation->zip = zip;