Mediaplayer: acquire the wake-lock synchronously
Bug: 265531109
Test: manual test with local test app
Change-Id: I6609960aa7eacbdf7609f28ca68d75eb48059db9
diff --git a/media/libmediaplayerservice/nuplayer/AWakeLock.cpp b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
index 366956c..e8556dd 100644
--- a/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
+++ b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
@@ -28,11 +28,13 @@
namespace android {
+const int32_t INVALID_DISPLAY_ID = -1;
+
AWakeLock::AWakeLock() :
mPowerManager(NULL),
mWakeLockToken(NULL),
mWakeLockCount(0),
- mDeathRecipient(new PMDeathRecipient(this)) {}
+ mDeathRecipient(new PMDeathRecipient(this)){}
AWakeLock::~AWakeLock() {
if (mPowerManager != NULL) {
@@ -59,10 +61,15 @@
if (mPowerManager != NULL) {
sp<IBinder> binder = new BBinder();
int64_t token = IPCThreadState::self()->clearCallingIdentity();
- binder::Status status = mPowerManager->acquireWakeLockAsync(
- binder, POWERMANAGER_PARTIAL_WAKE_LOCK,
- String16("AWakeLock"), String16("media"),
- {} /* workSource */, {} /* historyTag */);
+ binder::Status status = mPowerManager->acquireWakeLock(
+ binder,
+ /*flags= */ POWERMANAGER_PARTIAL_WAKE_LOCK,
+ /*tag=*/ String16("AWakeLock"),
+ /*packageName=*/ String16("media"),
+ /*ws=*/ {},
+ /*historyTag=*/ {},
+ /*displayId=*/ INVALID_DISPLAY_ID,
+ /*callback=*/NULL);
IPCThreadState::self()->restoreCallingIdentity(token);
if (status.isOk()) {
mWakeLockToken = binder;