diff options
author | Steve Block <steveblock@google.com> | 2012-01-05 14:07:02 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-05 14:07:02 -0800 |
commit | c267bab3d1c7980a03541283e88c0b6df378b826 (patch) | |
tree | 908514d7c739bc8051981a766ca5fc938495259f /services | |
parent | 69b310000d6b1853a1b49c5ea3794817245ae1d8 (diff) | |
parent | a19954ab377b46dbcb9cbe8a6ab6d458f2e32bca (diff) | |
download | frameworks_native-c267bab3d1c7980a03541283e88c0b6df378b826.zip frameworks_native-c267bab3d1c7980a03541283e88c0b6df378b826.tar.gz frameworks_native-c267bab3d1c7980a03541283e88c0b6df378b826.tar.bz2 |
Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"
Diffstat (limited to 'services')
-rw-r--r-- | services/surfaceflinger/DisplayHardware/DisplayHardware.cpp | 32 | ||||
-rw-r--r-- | services/surfaceflinger/EventThread.cpp | 2 | ||||
-rw-r--r-- | services/surfaceflinger/SurfaceFlinger.cpp | 12 |
3 files changed, 23 insertions, 23 deletions
diff --git a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp index 3bbc75e..2ffbd1e 100644 --- a/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp +++ b/services/surfaceflinger/DisplayHardware/DisplayHardware.cpp @@ -287,22 +287,22 @@ void DisplayHardware::init(uint32_t dpy) glGetIntegerv(GL_MAX_TEXTURE_SIZE, &mMaxTextureSize); glGetIntegerv(GL_MAX_VIEWPORT_DIMS, mMaxViewportDims); - LOGI("EGL informations:"); - LOGI("# of configs : %d", numConfigs); - LOGI("vendor : %s", extensions.getEglVendor()); - LOGI("version : %s", extensions.getEglVersion()); - LOGI("extensions: %s", extensions.getEglExtension()); - LOGI("Client API: %s", eglQueryString(display, EGL_CLIENT_APIS)?:"Not Supported"); - LOGI("EGLSurface: %d-%d-%d-%d, config=%p", r, g, b, a, config); - - LOGI("OpenGL informations:"); - LOGI("vendor : %s", extensions.getVendor()); - LOGI("renderer : %s", extensions.getRenderer()); - LOGI("version : %s", extensions.getVersion()); - LOGI("extensions: %s", extensions.getExtension()); - LOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize); - LOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]); - LOGI("flags = %08x", mFlags); + ALOGI("EGL informations:"); + ALOGI("# of configs : %d", numConfigs); + ALOGI("vendor : %s", extensions.getEglVendor()); + ALOGI("version : %s", extensions.getEglVersion()); + ALOGI("extensions: %s", extensions.getEglExtension()); + ALOGI("Client API: %s", eglQueryString(display, EGL_CLIENT_APIS)?:"Not Supported"); + ALOGI("EGLSurface: %d-%d-%d-%d, config=%p", r, g, b, a, config); + + ALOGI("OpenGL informations:"); + ALOGI("vendor : %s", extensions.getVendor()); + ALOGI("renderer : %s", extensions.getRenderer()); + ALOGI("version : %s", extensions.getVersion()); + ALOGI("extensions: %s", extensions.getExtension()); + ALOGI("GL_MAX_TEXTURE_SIZE = %d", mMaxTextureSize); + ALOGI("GL_MAX_VIEWPORT_DIMS = %d x %d", mMaxViewportDims[0], mMaxViewportDims[1]); + ALOGI("flags = %08x", mFlags); // Unbind the context from this thread eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); diff --git a/services/surfaceflinger/EventThread.cpp b/services/surfaceflinger/EventThread.cpp index dc39f88..9245781 100644 --- a/services/surfaceflinger/EventThread.cpp +++ b/services/surfaceflinger/EventThread.cpp @@ -209,7 +209,7 @@ bool EventThread::threadLoop() { } status_t EventThread::readyToRun() { - LOGI("EventThread ready to run."); + ALOGI("EventThread ready to run."); return NO_ERROR; } diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp index 789e03c..e77f08f 100644 --- a/services/surfaceflinger/SurfaceFlinger.cpp +++ b/services/surfaceflinger/SurfaceFlinger.cpp @@ -110,7 +110,7 @@ SurfaceFlinger::SurfaceFlinger() void SurfaceFlinger::init() { - LOGI("SurfaceFlinger is starting"); + ALOGI("SurfaceFlinger is starting"); // debugging stuff... char value[PROPERTY_VALUE_MAX]; @@ -127,9 +127,9 @@ void SurfaceFlinger::init() DdmConnection::start(getServiceName()); } - LOGI_IF(mDebugRegion, "showupdates enabled"); - LOGI_IF(mDebugBackground, "showbackground enabled"); - LOGI_IF(mDebugDDMS, "DDMS debugging enabled"); + ALOGI_IF(mDebugRegion, "showupdates enabled"); + ALOGI_IF(mDebugBackground, "showbackground enabled"); + ALOGI_IF(mDebugDDMS, "DDMS debugging enabled"); } SurfaceFlinger::~SurfaceFlinger() @@ -176,7 +176,7 @@ void SurfaceFlinger::bootFinished() { const nsecs_t now = systemTime(); const nsecs_t duration = now - mBootTime; - LOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) ); + ALOGI("Boot is finished (%ld ms)", long(ns2ms(duration)) ); mBootFinished = true; // wait patiently for the window manager death @@ -215,7 +215,7 @@ static inline uint16_t pack565(int r, int g, int b) { status_t SurfaceFlinger::readyToRun() { - LOGI( "SurfaceFlinger's main thread ready to run. " + ALOGI( "SurfaceFlinger's main thread ready to run. " "Initializing graphics H/W..."); // we only support one display currently |