commit d07ed5efa2b21a95552fca82291eba55eceae4b6
author Eric Laurent <elaurent@google.com> Fri Jun 24 10:48:02 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 24 10:48:02 2022 +0000
tree 1598eff4cce664fc7ff2c835e19b60dd9b5e512e
parent 0049e8743ef29de381592a3d6377ae08f60f4df6
parent 879552deec3aa2c29eb0be7849eef55eed970393

Merge "NuPlayer: use acquireWakeLockAsync in AWakeLock" into tm-qpr-dev am: f31cbefd91 am: 879552deec

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/19034944

Change-Id: Id5c86213a6cad431a694699fc7b11c01224d549d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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;