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

Commit 7fadabb8 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 am: 92f18d34 am: 4d348347 am: 5189dd4f

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



Change-Id: I8bb46d0e8365077196a5c1668586cea192a32a14
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf29000a 5189dd4f

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

+2 −1
Original line number Diff line number Diff line
@@ -1228,7 +1228,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
@@ -116,7 +116,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 InsetsSourceControl.Array mDummyControls =  new InsetsSourceControl.Array();

    final boolean mSetsUnrestrictedKeepClearAreas;