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 /include | |
| 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 'include')
| -rw-r--r-- | include/media/IResourceManagerService.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/media/IResourceManagerService.h b/include/media/IResourceManagerService.h index 067392c..1e4f6de 100644 --- a/include/media/IResourceManagerService.h +++ b/include/media/IResourceManagerService.h @@ -43,7 +43,7 @@ public: const sp<IResourceManagerClient> client, const Vector<MediaResource> &resources) = 0; - virtual void removeResource(int64_t clientId) = 0; + virtual void removeResource(int pid, int64_t clientId) = 0; virtual bool reclaimResource( int callingPid, diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index 09cbe8f..b1dc278 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -260,18 +260,18 @@ private: virtual void binderDied(const wp<IBinder>& /*who*/); void addResource( - int pid, int64_t clientId, const sp<IResourceManagerClient> client, const Vector<MediaResource> &resources); void removeResource(int64_t clientId); - bool reclaimResource(int callingPid, const Vector<MediaResource> &resources); + bool reclaimResource(const Vector<MediaResource> &resources); private: Mutex mLock; sp<IResourceManagerService> mService; + int mPid; }; State mState; |