diff options
| author | Ronghua Wu <ronghuawu@google.com> | 2015-07-18 03:07:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-18 03:07:05 +0000 |
| commit | 51390b48d311d1164a6638d3fe0b4a48aaa9028f (patch) | |
| tree | edb401cf9346bb27d1126df49ec15d61edf3a62a /media/libmedia | |
| parent | f6d07bc61fd7fefe9d2b2cbdaf637f2fdb1bd21e (diff) | |
| parent | 37c8924c508a7c9b8bd3c8ce80fc005070531902 (diff) | |
| download | frameworks_av-51390b48d311d1164a6638d3fe0b4a48aaa9028f.zip frameworks_av-51390b48d311d1164a6638d3fe0b4a48aaa9028f.tar.gz frameworks_av-51390b48d311d1164a6638d3fe0b4a48aaa9028f.tar.bz2 | |
Merge "mediaresourcemanager: add pid to removeResource method" into mnc-dev
Diffstat (limited to 'media/libmedia')
| -rw-r--r-- | media/libmedia/IResourceManagerService.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libmedia/IResourceManagerService.cpp b/media/libmedia/IResourceManagerService.cpp index 6902e99..4598686 100644 --- a/media/libmedia/IResourceManagerService.cpp +++ b/media/libmedia/IResourceManagerService.cpp @@ -85,9 +85,10 @@ public: remote()->transact(ADD_RESOURCE, data, &reply); } - virtual void removeResource(int64_t clientId) { + virtual void removeResource(int pid, int64_t clientId) { Parcel data, reply; data.writeInterfaceToken(IResourceManagerService::getInterfaceDescriptor()); + data.writeInt32(pid); data.writeInt64(clientId); remote()->transact(REMOVE_RESOURCE, data, &reply); @@ -139,8 +140,9 @@ status_t BnResourceManagerService::onTransact( case REMOVE_RESOURCE: { CHECK_INTERFACE(IResourceManagerService, data, reply); + int pid = data.readInt32(); int64_t clientId = data.readInt64(); - removeResource(clientId); + removeResource(pid, clientId); return NO_ERROR; } break; |