diff options
| author | Eric Laurent <elaurent@google.com> | 2013-10-04 19:57:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-04 19:57:14 +0000 |
| commit | 026c5b07fefd36e0e2dd7035c2898d0e28596d0f (patch) | |
| tree | 25d2d0581ce3b449c7a1bf8d9e2b34c5563eb30c /services | |
| parent | da0926afdb12794497c93d68eee296f2d92bfa7e (diff) | |
| parent | 547789d25dc6bd6561553bcf6b384fb0d4fee834 (diff) | |
| download | frameworks_av-026c5b07fefd36e0e2dd7035c2898d0e28596d0f.zip frameworks_av-026c5b07fefd36e0e2dd7035c2898d0e28596d0f.tar.gz frameworks_av-026c5b07fefd36e0e2dd7035c2898d0e28596d0f.tar.bz2 | |
Merge "audioflinger: fix wake lock acquisition check" into klp-dev
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 8aae892..943a70e 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -499,13 +499,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")); |