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

Commit ec6612cf authored by Riddle Hsu's avatar Riddle Hsu Committed by Gerrit Code Review
Browse files

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

parents a478dd71 f79810b5

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

+2 −1
Original line number Diff line number Diff line
@@ -1183,7 +1183,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];