Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE

See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: I0cbe865d464a37365fa3be84948b07e5a0d181d0
  • Loading branch information...
commit 60d056bf2926357260592409dee31374fa8e301b 1 parent f678d47
Steve Block authored
6 hardware.c
@@ -74,7 +74,7 @@ static int load(const char *id,
74 74 handle = dlopen(path, RTLD_NOW);
75 75 if (handle == NULL) {
76 76 char const *err_str = dlerror();
77   - LOGE("load: module=%s\n%s", path, err_str?err_str:"unknown");
  77 + ALOGE("load: module=%s\n%s", path, err_str?err_str:"unknown");
78 78 status = -EINVAL;
79 79 goto done;
80 80 }
@@ -83,14 +83,14 @@ static int load(const char *id,
83 83 const char *sym = HAL_MODULE_INFO_SYM_AS_STR;
84 84 hmi = (struct hw_module_t *)dlsym(handle, sym);
85 85 if (hmi == NULL) {
86   - LOGE("load: couldn't find symbol %s", sym);
  86 + ALOGE("load: couldn't find symbol %s", sym);
87 87 status = -EINVAL;
88 88 goto done;
89 89 }
90 90
91 91 /* Check that the id matches */
92 92 if (strcmp(id, hmi->id) != 0) {
93   - LOGE("load: id=%s != hmi->id=%s", id, hmi->id);
  93 + ALOGE("load: id=%s != hmi->id=%s", id, hmi->id);
94 94 status = -EINVAL;
95 95 goto done;
96 96 }
4 modules/gralloc/framebuffer.cpp
@@ -98,7 +98,7 @@ static int fb_post(struct framebuffer_device_t* dev, buffer_handle_t buffer)
98 98 m->info.activate = FB_ACTIVATE_VBL;
99 99 m->info.yoffset = offset / m->finfo.line_length;
100 100 if (ioctl(m->framebuffer->fd, FBIOPUT_VSCREENINFO, &m->info) == -1) {
101   - LOGE("FBIOPUT_VSCREENINFO failed");
  101 + ALOGE("FBIOPUT_VSCREENINFO failed");
102 102 m->base.unlock(&m->base, buffer);
103 103 return -errno;
104 104 }
@@ -280,7 +280,7 @@ int mapFrameBufferLocked(struct private_module_t* module)
280 280
281 281 void* vaddr = mmap(0, fbSize, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
282 282 if (vaddr == MAP_FAILED) {
283   - LOGE("Error mapping the framebuffer (%s)", strerror(errno));
  283 + ALOGE("Error mapping the framebuffer (%s)", strerror(errno));
284 284 return -errno;
285 285 }
286 286 module->framebuffer->base = intptr_t(vaddr);
4 modules/gralloc/gralloc.cpp
@@ -175,7 +175,7 @@ static int gralloc_alloc_buffer(alloc_device_t* dev,
175 175
176 176 fd = ashmem_create_region("gralloc-buffer", size);
177 177 if (fd < 0) {
178   - LOGE("couldn't create ashmem (%s)", strerror(-errno));
  178 + ALOGE("couldn't create ashmem (%s)", strerror(-errno));
179 179 err = -errno;
180 180 }
181 181
@@ -189,7 +189,7 @@ static int gralloc_alloc_buffer(alloc_device_t* dev,
189 189 }
190 190 }
191 191
192   - LOGE_IF(err, "gralloc failed err=%s", strerror(-err));
  192 + ALOGE_IF(err, "gralloc failed err=%s", strerror(-err));
193 193
194 194 return err;
195 195 }
2  modules/gralloc/gralloc_priv.h
@@ -101,7 +101,7 @@ struct private_handle_t {
101 101 h->numInts != sNumInts || h->numFds != sNumFds ||
102 102 hnd->magic != sMagic)
103 103 {
104   - LOGE("invalid gralloc handle (at %p)", h);
  104 + ALOGE("invalid gralloc handle (at %p)", h);
105 105 return -EINVAL;
106 106 }
107 107 return 0;
4 modules/gralloc/mapper.cpp
@@ -53,7 +53,7 @@ static int gralloc_map(gralloc_module_t const* module,
53 53 void* mappedAddress = mmap(0, size,
54 54 PROT_READ|PROT_WRITE, MAP_SHARED, hnd->fd, 0);
55 55 if (mappedAddress == MAP_FAILED) {
56   - LOGE("Could not mmap %s", strerror(errno));
  56 + ALOGE("Could not mmap %s", strerror(errno));
57 57 return -errno;
58 58 }
59 59 hnd->base = intptr_t(mappedAddress) + hnd->offset;
@@ -73,7 +73,7 @@ static int gralloc_unmap(gralloc_module_t const* module,
73 73 size_t size = hnd->size;
74 74 //ALOGD("unmapping from %p, size=%d", base, size);
75 75 if (munmap(base, size) < 0) {
76   - LOGE("Could not unmap %s", strerror(errno));
  76 + ALOGE("Could not unmap %s", strerror(errno));
77 77 }
78 78 }
79 79 hnd->base = 0;

0 comments on commit 60d056b

Please sign in to comment.
Something went wrong with that request. Please try again.