diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-09-08 16:35:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-08 16:35:00 +0000 |
| commit | 62ce207291353a13dd722855102e99684259a517 (patch) | |
| tree | 493260c6ba2dbc98cfa1d025cbcaed3aa25228ee /services | |
| parent | 2e97b01cecec65e690ac7da5df9433c52ff75bd8 (diff) | |
| parent | 3abc2ded40066f3b1df23aceb553f22d569c5cd3 (diff) | |
| download | frameworks_av-62ce207291353a13dd722855102e99684259a517.zip frameworks_av-62ce207291353a13dd722855102e99684259a517.tar.gz frameworks_av-62ce207291353a13dd722855102e99684259a517.tar.bz2 | |
Merge "Make IPowerManager native conform to .aidl for oneway" into lmp-dev
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/Threads.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index 942bff6..97b1753 100644 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -662,12 +662,14 @@ void AudioFlinger::ThreadBase::acquireWakeLock_l(int uid) binder, getWakeLockTag(), String16("media"), - uid); + uid, + true /* FIXME force oneway contrary to .aidl */); } else { status = mPowerManager->acquireWakeLock(POWERMANAGER_PARTIAL_WAKE_LOCK, binder, getWakeLockTag(), - String16("media")); + String16("media"), + true /* FIXME force oneway contrary to .aidl */); } if (status == NO_ERROR) { mWakeLockToken = binder; @@ -687,7 +689,8 @@ void AudioFlinger::ThreadBase::releaseWakeLock_l() if (mWakeLockToken != 0) { ALOGV("releaseWakeLock_l() %s", mName); if (mPowerManager != 0) { - mPowerManager->releaseWakeLock(mWakeLockToken, 0); + mPowerManager->releaseWakeLock(mWakeLockToken, 0, + true /* FIXME force oneway contrary to .aidl */); } mWakeLockToken.clear(); } @@ -723,7 +726,8 @@ void AudioFlinger::ThreadBase::updateWakeLockUids_l(const SortedVector<int> &uid if (mPowerManager != 0) { sp<IBinder> binder = new BBinder(); status_t status; - status = mPowerManager->updateWakeLockUids(mWakeLockToken, uids.size(), uids.array()); + status = mPowerManager->updateWakeLockUids(mWakeLockToken, uids.size(), uids.array(), + true /* FIXME force oneway contrary to .aidl */); ALOGV("acquireWakeLock_l() %s status %d", mName, status); } } |