commit 92902a026869cb57059411cb59d99c71835a9d17
author Eric Laurent <elaurent@google.com> Mon Jul 04 08:38:23 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jul 13 01:44:46 2022 +0000
tree b24acaefa62a9c0eafeb588b631a3bd426fec8f0
parent d722067c74786ab5683405e6caef1ca25543ac7f

Revert "NuPlayer: use acquireWakeLockAsync in AWakeLock"

This reverts commit b5af3edafb4f1bd6bf5893afb6151638743ecc2d.

Reason for revert: 234429395

Bug: 234429395
Change-Id: Id5ba82129d5b0d6bc0a7fb8b36e67d6c8fad42e0
(cherry picked from commit f9d8473ac2879aafdd52f45e0cce3c9b029ecac7)
Merged-In: Id5ba82129d5b0d6bc0a7fb8b36e67d6c8fad42e0

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

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