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

Merge "Remove dead code" into rvc-dev

Browse Source
This commit is contained in:
Galia Peycheva
2020-03-20 18:15:09 +00:00
committed by Android (Google) Code Review
parent 60e19c7656 6360c777ab
commit 497fa82bf5
1 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
services/core/java/com/android/server/wm/DisplayPolicy.java
View File

@@ -336,12 +336,6 @@ public class DisplayPolicy {
@GuardedBy("mHandler")
private SleepToken mDreamingSleepToken;
@GuardedBy("mHandler")
private SleepToken mWindowSleepToken;
private final Runnable mAcquireSleepTokenRunnable;
private final Runnable mReleaseSleepTokenRunnable;
// The windows we were told about in focusChanged.
private WindowState mFocusedWindow;
private WindowState mLastFocusedWindow;
@@ -401,8 +395,6 @@ public class DisplayPolicy {
private boolean mLastShowingDream;
private boolean mDreamingLockscreen;
private boolean mDreamingSleepTokenNeeded;
private boolean mWindowSleepTokenNeeded;
private boolean mLastWindowSleepTokenNeeded;
private boolean mAllowLockscreenWhenOn;
private InputConsumer mInputConsumer = null;
@@ -618,20 +610,6 @@ public class DisplayPolicy {
mStatusBarController.getAppTransitionListener());
mImmersiveModeConfirmation = new ImmersiveModeConfirmation(mContext, looper,
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
mScreenshotHelper = displayContent.isDefaultDisplay
@@ -2531,7 +2509,6 @@ public class DisplayPolicy {
mAllowLockscreenWhenOn = false;
mShowingDream = false;
mWindowSleepTokenNeeded = false;
mIsFreeformWindowOverlappingWithNavBar = false;
}
@@ -2745,23 +2722,10 @@ public class DisplayPolicy {
mService.notifyShowingDreamChanged();
}
updateWindowSleepToken();
mService.mPolicy.setAllowLockscreenWhenOn(getDisplayId(), mAllowLockscreenWhenOn);
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
* window.