diff options
4 files changed, 10 insertions, 43 deletions
diff --git a/core/java/android/window/KeyguardState.java b/core/java/android/window/KeyguardState.java index 6584d30cdaed..159275abb9ef 100644 --- a/core/java/android/window/KeyguardState.java +++ b/core/java/android/window/KeyguardState.java @@ -30,28 +30,23 @@ import java.util.Objects; */ public final class KeyguardState implements Parcelable { - private final int mDisplayId; - private final boolean mKeyguardShowing; private final boolean mAodShowing; - private KeyguardState(int displayId, boolean keyguardShowing, boolean aodShowing) { - mDisplayId = displayId; + private KeyguardState(boolean keyguardShowing, boolean aodShowing) { mKeyguardShowing = keyguardShowing; mAodShowing = aodShowing; } private KeyguardState(Parcel in) { - mDisplayId = in.readInt(); mKeyguardShowing = in.readBoolean(); mAodShowing = in.readBoolean(); } @Override public void writeToParcel(@NonNull Parcel dest, int flags) { - dest.writeInt(mDisplayId); dest.writeBoolean(mKeyguardShowing); dest.writeBoolean(mAodShowing); } @@ -70,13 +65,6 @@ public final class KeyguardState implements Parcelable { } }; - /** - * Gets the display id of this {@link KeyguardState}. - */ - public int getDisplayId() { - return mDisplayId; - } - /** Returns the keyguard showing value. */ public boolean getKeyguardShowing() { return mKeyguardShowing; @@ -89,15 +77,14 @@ public final class KeyguardState implements Parcelable { @Override public String toString() { - return "KeyguardState{ displayId=" + mDisplayId - + ", keyguardShowing=" + mKeyguardShowing + return "KeyguardState{ keyguardShowing=" + mKeyguardShowing + ", aodShowing=" + mAodShowing + '}'; } @Override public int hashCode() { - return Objects.hash(mDisplayId, mKeyguardShowing, mAodShowing); + return Objects.hash(mKeyguardShowing, mAodShowing); } @Override @@ -105,8 +92,7 @@ public final class KeyguardState implements Parcelable { if (!(obj instanceof KeyguardState other)) { return false; } - return mDisplayId == other.mDisplayId - && mKeyguardShowing == other.mKeyguardShowing + return mKeyguardShowing == other.mKeyguardShowing && mAodShowing == other.mAodShowing; } @@ -117,18 +103,11 @@ public final class KeyguardState implements Parcelable { /** Builder to construct the {@link KeyguardState}. */ public static final class Builder { - - private final int mDisplayId; - private boolean mKeyguardShowing; private boolean mAodShowing; - /** - * @param displayId the display of this {@link KeyguardState}. - */ - public Builder(int displayId) { - mDisplayId = displayId; + public Builder() { } /** @@ -154,7 +133,7 @@ public final class KeyguardState implements Parcelable { */ @NonNull public KeyguardState build() { - return new KeyguardState(mDisplayId, mKeyguardShowing, mAodShowing); + return new KeyguardState(mKeyguardShowing, mAodShowing); } } } diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java index 12d20bf0e517..f532be6b8277 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayController.java @@ -96,14 +96,6 @@ public class DisplayController { } /** - * Get all the displays from DisplayManager. - */ - public Display[] getDisplays() { - final DisplayManager displayManager = mContext.getSystemService(DisplayManager.class); - return displayManager.getDisplays(); - } - - /** * Gets the DisplayLayout associated with a display. */ public @Nullable DisplayLayout getDisplayLayout(int displayId) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java index 4c316de98744..f8e6285b0493 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java @@ -42,7 +42,6 @@ import android.os.IBinder; import android.os.RemoteException; import android.util.ArrayMap; import android.util.Log; -import android.view.Display; import android.view.SurfaceControl; import android.view.WindowManager; import android.window.IRemoteTransition; @@ -444,10 +443,8 @@ public class KeyguardTransitionHandler @Override public void startKeyguardTransition(boolean keyguardShowing, boolean aodShowing) { final WindowContainerTransaction wct = new WindowContainerTransaction(); - for (Display display : mDisplayController.getDisplays()) { - wct.addKeyguardState(new KeyguardState.Builder(display.getDisplayId()) - .setKeyguardShowing(keyguardShowing).setAodShowing(aodShowing).build()); - } + wct.addKeyguardState(new KeyguardState.Builder().setKeyguardShowing(keyguardShowing) + .setAodShowing(aodShowing).build()); mMainExecutor.execute(() -> { mTransitions.startTransition(keyguardShowing ? TRANSIT_TO_FRONT : TRANSIT_TO_BACK, wct, KeyguardTransitionHandler.this); diff --git a/services/core/java/com/android/server/wm/WindowOrganizerController.java b/services/core/java/com/android/server/wm/WindowOrganizerController.java index c42aa37d847b..ddff24d35232 100644 --- a/services/core/java/com/android/server/wm/WindowOrganizerController.java +++ b/services/core/java/com/android/server/wm/WindowOrganizerController.java @@ -1851,14 +1851,13 @@ class WindowOrganizerController extends IWindowOrganizerController.Stub } private int applyKeyguardState(@NonNull WindowContainerTransaction.HierarchyOp hop) { - int effects = TRANSACT_EFFECTS_NONE; + int effects = TRANSACT_EFFECTS_LIFECYCLE; final KeyguardState keyguardState = hop.getKeyguardState(); if (keyguardState != null) { - int displayId = keyguardState.getDisplayId(); boolean keyguardShowing = keyguardState.getKeyguardShowing(); boolean aodShowing = keyguardState.getAodShowing(); - mService.mKeyguardController.setKeyguardShown(displayId, keyguardShowing, aodShowing); + mService.setLockScreenShown(keyguardShowing, aodShowing); } return effects; } |