diff options
| author | Andrii Kulian <akulian@google.com> | 2017-01-27 15:58:05 -0800 |
|---|---|---|
| committer | Andrii Kulian <akulian@google.com> | 2017-01-27 17:27:11 -0800 |
| commit | 7211d2eba8e02b5e7462313798fc25c0bd36ab2d (patch) | |
| tree | 43dda93161f3f316734d23c8890421b4ce6f55eb /core/java | |
| parent | 977b106de6e5eca845244d3f01610ff025b948d0 (diff) | |
Rename flag that enables showing display content with keyguard
Renamed SHOW_WITH_INSECURE_LOCKSCREEN to CAN_SHOW_WITH_INSECURE_KEYGUARD.
Test: android.server.cts.ActivityManagerDisplayTests
Change-Id: Ie03ee59730a9e9e715b2bad0a14fdd107b8c7c00
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/display/DisplayManager.java | 2 | ||||
| -rw-r--r-- | core/java/android/view/Display.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/hardware/display/DisplayManager.java b/core/java/android/hardware/display/DisplayManager.java index 6788b67197e3..33a9f5eb67f0 100644 --- a/core/java/android/hardware/display/DisplayManager.java +++ b/core/java/android/hardware/display/DisplayManager.java @@ -248,7 +248,7 @@ public final class DisplayManager { * * @see #createVirtualDisplay */ - public static final int VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 1 << 5; + public static final int VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 1 << 5; /** @hide */ public DisplayManager(Context context) { diff --git a/core/java/android/view/Display.java b/core/java/android/view/Display.java index ebb9cf974516..3ba55ed2c4dc 100644 --- a/core/java/android/view/Display.java +++ b/core/java/android/view/Display.java @@ -204,7 +204,7 @@ public final class Display { * * @see #getFlags */ - public static final int FLAG_SHOW_WITH_INSECURE_LOCKSCREEN = 1 << 5; + public static final int FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD = 1 << 5; /** * Display flag: Indicates that the contents of the display should not be scaled |