Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 2168 into donut

Browse Source 
* changes:
  Fix permission hole in camera service. Some debugging code was added to CameraService::onTransact() method during development. Later on the entire onTransact() method was #ifdef'd out, which inadvertently omitted the permissions check code. This change restores the code.
This commit is contained in:
Android (Google) Code Review
2009-05-21 07:55:39 -07:00
parent 3343af5fdb b1f3b8f7cb
commit db79edc5dc
2 changed files with 3 additions and 6 deletions
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) \ #define CHECK_INTERFACE(interface, data, reply) \
do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \ do { if (!data.enforceInterface(interface::getInterfaceDescriptor())) { \
LOGW("Call incorrectly routed to " #interface); \ LOGW("Call incorrectly routed to " #interface); \
@@ -1085,6 +1083,8 @@ status_t CameraService::onTransact(
status_t err = BnCameraService::onTransact(code, data, reply, flags); status_t err = BnCameraService::onTransact(code, data, reply, flags);
#if DEBUG_HEAP_LEAKS
LOGD("+++ onTransact err %d code %d", err, code); LOGD("+++ onTransact err %d code %d", err, code);
if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) { if (err == UNKNOWN_TRANSACTION || err == PERMISSION_DENIED) {
@@ -1120,9 +1120,8 @@ status_t CameraService::onTransact(
break; break;
} }
} }
#endif // DEBUG_HEAP_LEAKS
return err; return err;
} }
#endif // DEBUG_HEAP_LEAKS
}; // namespace android }; // namespace android

2
camera/libcameraservice/CameraService.h
View File

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