diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-09-08 16:59:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-08 16:59:42 +0000 |
| commit | f4207cd4024e421bf51e5cd1457dd454f52be68a (patch) | |
| tree | 59cea0eaf7f4cd5473977aa614f8228b58abc6ef /media/libstagefright | |
| parent | 8636d03dd14fa996bb0f8bf2f4714319173d886e (diff) | |
| parent | b12d6a17d33141789c974e3bd3eacfcb0be1c1e3 (diff) | |
| download | frameworks_av-f4207cd4024e421bf51e5cd1457dd454f52be68a.zip frameworks_av-f4207cd4024e421bf51e5cd1457dd454f52be68a.tar.gz frameworks_av-f4207cd4024e421bf51e5cd1457dd454f52be68a.tar.bz2 | |
am b12d6a17: am 62ce2072: Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
* commit 'b12d6a17d33141789c974e3bd3eacfcb0be1c1e3':
Make IPowerManager native conform to .aidl for oneway
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/TimedEventQueue.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/TimedEventQueue.cpp b/media/libstagefright/TimedEventQueue.cpp index da50c56..1fdb244 100644 --- a/media/libstagefright/TimedEventQueue.cpp +++ b/media/libstagefright/TimedEventQueue.cpp @@ -338,7 +338,7 @@ void TimedEventQueue::acquireWakeLock_l() status_t status = mPowerManager->acquireWakeLock(POWERMANAGER_PARTIAL_WAKE_LOCK, binder, String16("TimedEventQueue"), - String16("media")); + String16("media")); // not oneway IPCThreadState::self()->restoreCallingIdentity(token); if (status == NO_ERROR) { mWakeLockToken = binder; @@ -363,7 +363,7 @@ void TimedEventQueue::releaseWakeLock_l(bool force) CHECK(mWakeLockToken != 0); if (mPowerManager != 0) { int64_t token = IPCThreadState::self()->clearCallingIdentity(); - mPowerManager->releaseWakeLock(mWakeLockToken, 0); + mPowerManager->releaseWakeLock(mWakeLockToken, 0); // not oneway IPCThreadState::self()->restoreCallingIdentity(token); } mWakeLockToken.clear(); |