Remove keyguard candidate.

Test: No-op refactoring, existing tests pass.
Bug: 191438572
Change-Id: I187b5a5654bf7d10e63373fca8c40398838e655c
This commit is contained in:
Issei Suzuki
2021-10-20 11:09:25 +02:00
parent 5a9ab8d69a
commit a9573379e2
4 changed files with 0 additions and 26 deletions

View File

@@ -404,7 +404,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
private AccessibilityShortcutController mAccessibilityShortcutController;
boolean mSafeMode;
private WindowState mKeyguardCandidate = null;
// Whether to allow dock apps with METADATA_DOCK_HOME to temporarily take over the Home key.
// This is for car dock and this is updated from resource.
@@ -3271,14 +3270,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mNavBarVirtualKeyHapticFeedbackEnabled = enabled;
}
/** {@inheritDoc} */
@Override
public void setKeyguardCandidateLw(WindowState win) {
mKeyguardCandidate = win;
setKeyguardOccludedLw(isKeyguardOccluded(), true /* force */,
false /* keyguardOccludingStarted */);
}
/**
* Updates the occluded state of the Keyguard.
*

View File

@@ -721,13 +721,6 @@ public interface WindowManagerPolicy extends WindowManagerPolicyConstants {
int theme, CompatibilityInfo compatInfo, CharSequence nonLocalizedLabel, int labelRes,
int icon, int logo, int windowFlags, Configuration overrideConfig, int displayId);
/**
* Set or clear a window which can behave as the keyguard.
*
* @param win The window which can behave as the keyguard.
*/
void setKeyguardCandidateLw(@Nullable WindowState win);
/**
* Create and return an animation to re-display a window that was force hidden by Keyguard.
*/

View File

@@ -1094,9 +1094,6 @@ public class DisplayPolicy {
switch (attrs.type) {
case TYPE_NOTIFICATION_SHADE:
mNotificationShade = win;
if (mDisplayContent.isDefaultDisplay) {
mService.mPolicy.setKeyguardCandidateLw(win);
}
break;
case TYPE_STATUS_BAR:
mStatusBar = win;
@@ -1292,9 +1289,6 @@ public class DisplayPolicy {
mDisplayContent.setInsetProvider(ITYPE_NAVIGATION_BAR, null, null);
} else if (mNotificationShade == win) {
mNotificationShade = null;
if (mDisplayContent.isDefaultDisplay) {
mService.mPolicy.setKeyguardCandidateLw(null);
}
} else if (mClimateBarAlt == win) {
mClimateBarAlt = null;
mDisplayContent.setInsetProvider(ITYPE_CLIMATE_BAR, null, null);

View File

@@ -127,10 +127,6 @@ class TestWindowManagerPolicy implements WindowManagerPolicy {
};
}
@Override
public void setKeyguardCandidateLw(WindowState win) {
}
@Override
public Animation createHiddenByKeyguardExit(boolean onWallpaper,
boolean goingToNotificationShade, boolean subtleAnimation) {