commit 037960657984e131b1502e658e0ab07b76dec49b
author Sean Stout <sstout@google.com> Tue Mar 09 21:18:43 2021 -0800
committer Sean Stout <sstout@google.com> Wed Mar 24 22:04:21 2021 +0000
tree 3a1b116a3711a1034c132389fa7d2a7d5faf838c
parent f09d5fa8d60917811e50b104b8b5fad4af651254

Update AWakeLock to supply a display id.

The wakelock API is being updated to take display id to support
per-DisplayGroup wakelocks. AWakeLock can supply -1 as the wakelock is a
partial wakelock and thus does not need a valid display id.

Bug: 168210495
Change-Id: I305d43f375ac33ebc805d4bffd07a799fab236bc

media/libmediaplayerservice/nuplayer/AWakeLock.cpp

diff --git a/media/libmediaplayerservice/nuplayer/AWakeLock.cpp b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
index 7bee002..af9cf45 100644
--- a/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
+++ b/media/libmediaplayerservice/nuplayer/AWakeLock.cpp
@@ -62,7 +62,7 @@
             binder::Status status = mPowerManager->acquireWakeLock(
                     binder, POWERMANAGER_PARTIAL_WAKE_LOCK,
                     String16("AWakeLock"), String16("media"),
-                    {} /* workSource */, {} /* historyTag */);
+                    {} /* workSource */, {} /* historyTag */, -1 /* displayId */);
             IPCThreadState::self()->restoreCallingIdentity(token);
             if (status.isOk()) {
                 mWakeLockToken = binder;