diff options
| author | Eric Laurent <elaurent@google.com> | 2013-10-04 13:40:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 13:40:30 -0700 |
| commit | 1c7feca9cc3e408dfeb632e7060cf31e5015227e (patch) | |
| tree | be699837f659d5736a37190b28c7658e65959bf8 /services | |
| parent | 140f08fea6a4ad97fa8446498c713412ac734b79 (diff) | |
| parent | 6c48a01188746202164f8e10d63ff3775dfcf727 (diff) | |
| download | frameworks_av-1c7feca9cc3e408dfeb632e7060cf31e5015227e.zip frameworks_av-1c7feca9cc3e408dfeb632e7060cf31e5015227e.tar.gz frameworks_av-1c7feca9cc3e408dfeb632e7060cf31e5015227e.tar.bz2 | |
am 6c48a011: am 026c5b07: Merge "audioflinger: fix wake lock acquisition check" into klp-dev
* commit '6c48a01188746202164f8e10d63ff3775dfcf727':
audioflinger: fix wake lock acquisition check
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 6ae0540..54cc4f6 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -517,13 +517,13 @@ void AudioFlinger::ThreadBase::acquireWakeLock_l(int uid) sp<IBinder> binder = new BBinder(); status_t status; if (uid >= 0) { - mPowerManager->acquireWakeLockWithUid(POWERMANAGER_PARTIAL_WAKE_LOCK, + status = mPowerManager->acquireWakeLockWithUid(POWERMANAGER_PARTIAL_WAKE_LOCK, binder, String16(mName), String16("media"), uid); } else { - mPowerManager->acquireWakeLock(POWERMANAGER_PARTIAL_WAKE_LOCK, + status = mPowerManager->acquireWakeLock(POWERMANAGER_PARTIAL_WAKE_LOCK, binder, String16(mName), String16("media")); |