Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92f18d34 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

Merge "Add package name to WorkSource for Wakelock acquired from WindowManage." am: ec6612cf am: 7c67a601

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2471205



Change-Id: I326d73b9c971fe989f21bd9ce7dcac1a477ecb36
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bb974114 7c67a601

services/core/java/com/android/server/wm/DisplayContent.java

+2 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp 
    private void finishHoldScreenUpdate() {

        final boolean hold = mTmpHoldScreenWindow != null;

        if (hold && mTmpHoldScreenWindow != mHoldScreenWindow) {

            mHoldScreenWakeLock.setWorkSource(new WorkSource(mTmpHoldScreenWindow.mSession.mUid));

            mHoldScreenWakeLock.setWorkSource(new WorkSource(mTmpHoldScreenWindow.mSession.mUid,

                    mTmpHoldScreenWindow.mSession.mPackageName));

        }

        mHoldScreenWindow = mTmpHoldScreenWindow;

        mTmpHoldScreenWindow = null;

services/core/java/com/android/server/wm/Session.java

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ class Session extends IWindowSession.Stub implements IBinder.DeathRecipient { 
    private boolean mShowingAlertWindowNotificationAllowed;

    private boolean mClientDead = false;

    private float mLastReportedAnimatorScale;

    private String mPackageName;

    protected String mPackageName;

    private String mRelayoutTag;

    private final InsetsVisibilities mDummyRequestedVisibilities = new InsetsVisibilities();

    private final InsetsSourceControl[] mDummyControls =  new InsetsSourceControl[0];