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

Commit 0d30c924 authored by Galia Peycheva's avatar Galia Peycheva Committed by Automerger Merge Worker
Browse files

Merge "Remove dead code" into rvc-dev am: 497fa82b am: 18d6b1d2 am: e58bca51 am: 384c49c9 

Change-Id: Id7dc24307e119abbda6463ef75a5bf8c3228dabe
parents e21101be 384c49c9

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

+0 −36
Original line number Original line Diff line number Diff line
@@ -336,12 +336,6 @@ public class DisplayPolicy { 
    @GuardedBy("mHandler")

    @GuardedBy("mHandler")

    private SleepToken mDreamingSleepToken;

    private SleepToken mDreamingSleepToken;





    @GuardedBy("mHandler")

    private SleepToken mWindowSleepToken;



    private final Runnable mAcquireSleepTokenRunnable;

    private final Runnable mReleaseSleepTokenRunnable;



    // The windows we were told about in focusChanged.

    // The windows we were told about in focusChanged.

    private WindowState mFocusedWindow;

    private WindowState mFocusedWindow;

    private WindowState mLastFocusedWindow;

    private WindowState mLastFocusedWindow;
@@ -401,8 +395,6 @@ public class DisplayPolicy { 
    private boolean mLastShowingDream;

    private boolean mLastShowingDream;

    private boolean mDreamingLockscreen;

    private boolean mDreamingLockscreen;

    private boolean mDreamingSleepTokenNeeded;

    private boolean mDreamingSleepTokenNeeded;

    private boolean mWindowSleepTokenNeeded;

    private boolean mLastWindowSleepTokenNeeded;

    private boolean mAllowLockscreenWhenOn;

    private boolean mAllowLockscreenWhenOn;





    private InputConsumer mInputConsumer = null;

    private InputConsumer mInputConsumer = null;
@@ -618,20 +610,6 @@ public class DisplayPolicy { 
                mStatusBarController.getAppTransitionListener());

                mStatusBarController.getAppTransitionListener());

        mImmersiveModeConfirmation = new ImmersiveModeConfirmation(mContext, looper,

        mImmersiveModeConfirmation = new ImmersiveModeConfirmation(mContext, looper,

                mService.mVrModeEnabled);

                mService.mVrModeEnabled);

        mAcquireSleepTokenRunnable = () -> {

            if (mWindowSleepToken != null) {

                return;

            }

            mWindowSleepToken = service.mAtmInternal.acquireSleepToken(

                    "WindowSleepTokenOnDisplay" + displayId, displayId);

        };

        mReleaseSleepTokenRunnable = () -> {

            if (mWindowSleepToken == null) {

                return;

            }

            mWindowSleepToken.release();

            mWindowSleepToken = null;

        };





        // TODO: Make it can take screenshot on external display

        // TODO: Make it can take screenshot on external display

        mScreenshotHelper = displayContent.isDefaultDisplay

        mScreenshotHelper = displayContent.isDefaultDisplay
@@ -2531,7 +2509,6 @@ public class DisplayPolicy { 




        mAllowLockscreenWhenOn = false;

        mAllowLockscreenWhenOn = false;

        mShowingDream = false;

        mShowingDream = false;

        mWindowSleepTokenNeeded = false;

        mIsFreeformWindowOverlappingWithNavBar = false;

        mIsFreeformWindowOverlappingWithNavBar = false;

    }

    }
@@ -2745,23 +2722,10 @@ public class DisplayPolicy { 
            mService.notifyShowingDreamChanged();

            mService.notifyShowingDreamChanged();

        }

        }





        updateWindowSleepToken();



        mService.mPolicy.setAllowLockscreenWhenOn(getDisplayId(), mAllowLockscreenWhenOn);

        mService.mPolicy.setAllowLockscreenWhenOn(getDisplayId(), mAllowLockscreenWhenOn);

        return changes;

        return changes;

    }

    }





    private void updateWindowSleepToken() {

        if (mWindowSleepTokenNeeded && !mLastWindowSleepTokenNeeded) {

            mHandler.removeCallbacks(mReleaseSleepTokenRunnable);

            mHandler.post(mAcquireSleepTokenRunnable);

        } else if (!mWindowSleepTokenNeeded && mLastWindowSleepTokenNeeded) {

            mHandler.removeCallbacks(mAcquireSleepTokenRunnable);

            mHandler.post(mReleaseSleepTokenRunnable);

        }

        mLastWindowSleepTokenNeeded = mWindowSleepTokenNeeded;

    }



    /**

    /**

     * @return Whether the top app should hide the statusbar based on the top fullscreen opaque

     * @return Whether the top app should hide the statusbar based on the top fullscreen opaque

     *         window.

     *         window.