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 /services | |
| 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 '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 69936f8..618a719 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); } } |