Merge "SurfaceFlinger: fix 64-bit format string warnings" (112aa42e) · Commits · e / os / android_frameworks_native-old

services/surfaceflinger/DisplayDevice.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -462,7 +462,7 @@ void DisplayDevice::dump(String8& result) const {
		result.appendFormat(
		"+ DisplayDevice: %s\n"
		" type=%x, hwcId=%d, layerStack=%u, (%4dx%4d), ANativeWindow=%p, orient=%2d (type=%08x), "
		"flips=%u, isSecure=%d, secureVis=%d, acquired=%d, numLayers=%u\n"
		"flips=%u, isSecure=%d, secureVis=%d, acquired=%d, numLayers=%zu\n"
		" v:[%d,%d,%d,%d], f:[%d,%d,%d,%d], s:[%d,%d,%d,%d],"
		"transform:[[%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f][%0.3f,%0.3f,%0.3f]]\n",
		mDisplayName.string(), mType, mHwcDisplayId,

services/surfaceflinger/EventThread.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -328,7 +328,7 @@ void EventThread::dump(String8& result) const {
		mDebugVsyncEnabled?"enabled":"disabled");
		result.appendFormat(" soft-vsync: %s\n",
		mUseSoftwareVSync?"enabled":"disabled");
		result.appendFormat(" numListeners=%u,\n events-delivered: %u\n",
		result.appendFormat(" numListeners=%zu,\n events-delivered: %u\n",
		mDisplayEventConnections.size(),
		mVSyncEvent[DisplayDevice::DISPLAY_PRIMARY].vsync.count);
		for (size_t i=0 ; i<mDisplayEventConnections.size() ; i++) {

services/surfaceflinger/FrameTracker.cpp

+3 −1

Original line number	Diff line number	Diff line
		@@ -17,6 +17,8 @@
		// This is needed for stdint.h to define INT64_MAX in C++
		#define __STDC_LIMIT_MACROS

		#include <inttypes.h>

		#include <cutils/log.h>

		#include <ui/Fence.h>
		@@ -211,7 +213,7 @@ void FrameTracker::dump(String8& result) const {
		const size_t o = mOffset;
		for (size_t i = 1; i < NUM_FRAME_RECORDS; i++) {
		const size_t index = (o+i) % NUM_FRAME_RECORDS;
		result.appendFormat("%lld\t%lld\t%lld\n",
		result.appendFormat("%" PRId64 "\t%" PRId64 "\t%" PRId64 "\n",
		mFrameRecords[index].desiredPresentTime,
		mFrameRecords[index].actualPresentTime,
		mFrameRecords[index].frameReadyTime);

services/surfaceflinger/SurfaceFlinger.cpp

+7 −6

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <errno.h>
		#include <math.h>
		#include <dlfcn.h>
		#include <inttypes.h>

		#include <EGL/egl.h>

		@@ -429,7 +430,7 @@ void SurfaceFlinger::init() {
		// FIXME: currently we don't get blank/unblank requests
		// for displays other than the main display, so we always
		// assume a connected display is unblanked.
		ALOGD("marking display %d as acquired/unblanked", i);
		ALOGD("marking display %zu as acquired/unblanked", i);
		hw->acquireScreen();
		}
		mDisplays.add(token, hw);
		@@ -1639,7 +1640,7 @@ void SurfaceFlinger::doComposeSurfaces(const sp<const DisplayDevice>& hw, const
		case HWC_FRAMEBUFFER_TARGET: {
		// this should not happen as the iterator shouldn't
		// let us get there.
		ALOGW("HWC_FRAMEBUFFER_TARGET found in hwc list (index=%d)", i);
		ALOGW("HWC_FRAMEBUFFER_TARGET found in hwc list (index=%zu)", i);
		break;
		}
		}
		@@ -2224,7 +2225,7 @@ void SurfaceFlinger::dumpStatsLocked(const Vector<String16>& args, size_t& index

		const nsecs_t period =
		getHwComposer().getRefreshPeriod(HWC_DISPLAY_PRIMARY);
		result.appendFormat("%lld\n", period);
		result.appendFormat("%" PRId64 "\n", period);

		if (name.isEmpty()) {
		mAnimFrameTracker.dump(result);
		@@ -2337,7 +2338,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index,
		const LayerVector& currentLayers = mCurrentState.layersSortedByZ;
		const size_t count = currentLayers.size();
		colorizer.bold(result);
		result.appendFormat("Visible layers (count = %d)\n", count);
		result.appendFormat("Visible layers (count = %zu)\n", count);
		colorizer.reset(result);
		for (size_t i=0 ; i<count ; i++) {
		const sp<Layer>& layer(currentLayers[i]);
		@@ -2349,7 +2350,7 @@ void SurfaceFlinger::dumpAllLocked(const Vector<String16>& args, size_t& index,
		*/

		colorizer.bold(result);
		result.appendFormat("Displays (%d entries)\n", mDisplays.size());
		result.appendFormat("Displays (%zu entries)\n", mDisplays.size());
		colorizer.reset(result);
		for (size_t dpy=0 ; dpy<mDisplays.size() ; dpy++) {
		const sp<const DisplayDevice>& hw(mDisplays[dpy]);
		@@ -2932,7 +2933,7 @@ void SurfaceFlinger::checkScreenshot(size_t w, size_t s, size_t h, void const* v
		const bool visible = (state.layerStack == hw->getLayerStack())
		&& (state.z >= minLayerZ && state.z <= maxLayerZ)
		&& (layer->isVisible());
		ALOGE("%c index=%d, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%x",
		ALOGE("%c index=%zu, name=%s, layerStack=%d, z=%d, visible=%d, flags=%x, alpha=%x",
		visible ? '+' : '-',
		i, layer->getName().string(), state.layerStack, state.z,
		layer->isVisible(), state.flags, state.alpha);