Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add package name to WorkSource for Wakelock acquired from WindowManage."

Browse Source
This commit is contained in:
Riddle Hsu
2023-03-21 11:30:50 +00:00
committed by Gerrit Code Review
parent a478dd713a f79810b58f
commit ec6612cfcf
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -1183,7 +1183,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
private void finishHoldScreenUpdate() { private void finishHoldScreenUpdate() {
final boolean hold = mTmpHoldScreenWindow != null; final boolean hold = mTmpHoldScreenWindow != null;
if (hold && mTmpHoldScreenWindow != mHoldScreenWindow) { if (hold && mTmpHoldScreenWindow != mHoldScreenWindow) {
mHoldScreenWakeLock.setWorkSource(new WorkSource(mTmpHoldScreenWindow.mSession.mUid)); mHoldScreenWakeLock.setWorkSource(new WorkSource(mTmpHoldScreenWindow.mSession.mUid,
mTmpHoldScreenWindow.mSession.mPackageName));
} }
mHoldScreenWindow = mTmpHoldScreenWindow; mHoldScreenWindow = mTmpHoldScreenWindow;
mTmpHoldScreenWindow = null; mTmpHoldScreenWindow = null;

2
services/core/java/com/android/server/wm/Session.java
View File

@@ -115,7 +115,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient {
private boolean mShowingAlertWindowNotificationAllowed; private boolean mShowingAlertWindowNotificationAllowed;
private boolean mClientDead = false; private boolean mClientDead = false;
private float mLastReportedAnimatorScale; private float mLastReportedAnimatorScale;
private String mPackageName; protected String mPackageName;
private String mRelayoutTag; private String mRelayoutTag;
private final InsetsVisibilities mDummyRequestedVisibilities = new InsetsVisibilities(); private final InsetsVisibilities mDummyRequestedVisibilities = new InsetsVisibilities();
private final InsetsSourceControl[] mDummyControls = new InsetsSourceControl[0]; private final InsetsSourceControl[] mDummyControls = new InsetsSourceControl[0];