diff options
| author | Adrian Roos <roosa@google.com> | 2017-11-20 17:55:31 +0100 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2017-11-23 17:23:26 +0100 |
| commit | e99bc0501a288735d337f2ff64f8fa47f766a59b (patch) | |
| tree | 2d9c23f38c8f10758ea868eb9dd5e5effea2f737 /core/java/android/view/Display.java | |
| parent | 78252a23d6d38e4b1c938fef3d7b1dc6b7dfbe05 (diff) | |
WM: Move WindowManagerPolicy, DisplayFrames and WindowManagerInternal into services
Splits WindowManagerPolicy into a framework and a services part, preventing concepts that are
internal to the window manager from leaking out into the framework.
Test: make droid
Change-Id: I7b6a54f55f76f6fbb5f27090981b8f1d4d8be88b
Diffstat (limited to 'core/java/android/view/Display.java')
| -rw-r--r-- | core/java/android/view/Display.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index 6a44cdb9ee57..9673be01d7fb 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -20,6 +20,7 @@ import static android.Manifest.permission.CONFIGURE_DISPLAY_COLOR_MODE; import android.annotation.IntDef; import android.annotation.RequiresPermission; +import android.app.KeyguardManager; import android.content.res.CompatibilityInfo; import android.content.res.Configuration; import android.content.res.Resources; @@ -209,8 +210,8 @@ public final class Display { * </p> * * @see DisplayManager#VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD - * @see WindowManagerPolicy#isKeyguardSecure(int) - * @see WindowManagerPolicy#isKeyguardTrustedLw() + * @see KeyguardManager#isDeviceSecure() + * @see KeyguardManager#isDeviceLocked() * @see #getFlags * @hide */ |