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

Merge "Remove dead code" into rvc-dev am: 497fa82bf5 am: 18d6b1d28e

Browse Source 
Change-Id: I168fc9de808ce570451ebaa686a39339af0f39e1
This commit is contained in:
Galia Peycheva
2020-03-20 18:26:11 +00:00
committed by Automerger Merge Worker
parent ec5b5037f0 18d6b1d28e
commit e58bca514c
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") @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.