ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am db79edc5: Merge change 2168 into donut

Browse Source 
Merge commit 'db79edc5dc39e103356cad8781148a8794520bc5'

* commit 'db79edc5dc39e103356cad8781148a8794520bc5':
  Fix permission hole in camera service. Some debugging code was added
This commit is contained in:
Android (Google) Code Review 2009-05-21 09:42:24 -07:00 committed by The Android Open Source Project
commit cfae00675e
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
camera/libcameraservice/CameraService.cpp
View File

@ -1052,8 +1052,6 @@ status_t CameraService::dump(int fd, const Vector<String16>& args)
}
#if DEBUG_HEAP_LEAKS
#define CHECK_INTERFACE(interface, data, reply) \
do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \
LOGW("Call incorrectly routed to " #interface); \
@ -1085,6 +1083,8 @@ status_t CameraService::onTransact(
status_t err = BnCameraService::onTransact(code, data, reply, flags);
#if DEBUG_HEAP_LEAKS
LOGD("+++ onTransact err %d code %d", err, code);
if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {
@ -1120,9 +1120,8 @@ status_t CameraService::onTransact(
break;
}
}
#endif // DEBUG_HEAP_LEAKS
return err;
}
#endif // DEBUG_HEAP_LEAKS
}; // namespace android

2
camera/libcameraservice/CameraService.h
View File

@ -58,10 +58,8 @@ public:
void removeClient(const sp<ICameraClient>& cameraClient);
#if DEBUG_HEAP_LEAKS
virtual status_t onTransact(
uint32_t code, const Parcel& data, Parcel* reply, uint32_t flags);
#endif
private: