diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-22 10:14:43 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-05-22 10:14:43 -0700 |
| commit | 87cebadd48710e42474756fc3513df678de045ce (patch) | |
| tree | 6f8a07d9ec9b4ebad70367430190a689cb1a5db3 /services/medialog | |
| parent | 77a3374a6170fb5f0168169bc4bc3fa9baf318eb (diff) | |
| parent | f285c91efbae23783fe94dc5ad19a2560e157685 (diff) | |
| download | frameworks_av-87cebadd48710e42474756fc3513df678de045ce.zip frameworks_av-87cebadd48710e42474756fc3513df678de045ce.tar.gz frameworks_av-87cebadd48710e42474756fc3513df678de045ce.tar.bz2 | |
resolved conflicts for merge of f285c91e to master
Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
Diffstat (limited to 'services/medialog')
| -rw-r--r-- | services/medialog/MediaLogService.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/medialog/MediaLogService.cpp b/services/medialog/MediaLogService.cpp index 0c7fbbd..41dab1f 100644 --- a/services/medialog/MediaLogService.cpp +++ b/services/medialog/MediaLogService.cpp @@ -60,7 +60,7 @@ status_t MediaLogService::dump(int fd, const Vector<String16>& args __unused) static const String16 sDump("android.permission.DUMP"); if (!(IPCThreadState::self()->getCallingUid() == AID_MEDIA || PermissionCache::checkCallingPermission(sDump))) { - fdprintf(fd, "Permission Denial: can't dump media.log from pid=%d, uid=%d\n", + dprintf(fd, "Permission Denial: can't dump media.log from pid=%d, uid=%d\n", IPCThreadState::self()->getCallingPid(), IPCThreadState::self()->getCallingUid()); return NO_ERROR; @@ -74,7 +74,7 @@ status_t MediaLogService::dump(int fd, const Vector<String16>& args __unused) for (size_t i = 0; i < namedReaders.size(); i++) { const NamedReader& namedReader = namedReaders[i]; if (fd >= 0) { - fdprintf(fd, "\n%s:\n", namedReader.name()); + dprintf(fd, "\n%s:\n", namedReader.name()); } else { ALOGI("%s:", namedReader.name()); } |