commit f31cbefd91010d0f7a0f7319f1003741ba2ad066
author Eric Laurent <elaurent@google.com> Fri Jun 24 10:12:17 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 24 10:12:17 2022 +0000
tree d1ce91c20c6ef95b568e6fa5f5374d7ec7c4d85f
parent f4c80d770a866b40da7aa948a0466390fbb0bf6c
parent 781a7fd317662fba9ebbcb65b481b48e98d3aec7

Merge "NuPlayer: use acquireWakeLockAsync in AWakeLock" into tm-qpr-dev

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

diff --git a/media/libmediaplayerservice/nuplayer/AWakeLock.cpp b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
index c3bd207..25a8ae4 100644
--- a/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
+++ b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
@@ -59,11 +59,10 @@
         if (mPowerManager != NULL) {
             sp<IBinder> binder = new BBinder();
             int64_t token = IPCThreadState::self()->clearCallingIdentity();
-            binder::Status status = mPowerManager->acquireWakeLock(
+            binder::Status status = mPowerManager->acquireWakeLockAsync(
                     binder, POWERMANAGER_PARTIAL_WAKE_LOCK,
                     String16("AWakeLock"), String16("media"),
-                    {} /* workSource */, {} /* historyTag */, -1 /* displayId */,
-                    nullptr /* callback */);
+                    {} /* workSource */, {} /* historyTag */);
             IPCThreadState::self()->restoreCallingIdentity(token);
             if (status.isOk()) {
                 mWakeLockToken = binder;