commit 7211d2eba8e02b5e7462313798fc25c0bd36ab2d
author Andrii Kulian <akulian@google.com> Fri Jan 27 15:58:05 2017 -0800
committer Andrii Kulian <akulian@google.com> Fri Jan 27 17:27:11 2017 -0800
tree 43dda93161f3f316734d23c8890421b4ce6f55eb
parent 977b106de6e5eca845244d3f01610ff025b948d0

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

services/core/java/com/android/server/display/DisplayManagerService.java

diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index 7d18d36..fd89b97 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -21,7 +21,7 @@
 import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;
 import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_SECURE;
 import static android.hardware.display.DisplayManager
-        .VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN;
+        .VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD;
 
 import com.android.internal.util.IndentingPrintWriter;
 
@@ -29,7 +29,6 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.hardware.SensorManager;
-import android.hardware.display.DisplayManager;
 import android.hardware.display.DisplayManagerGlobal;
 import android.hardware.display.DisplayManagerInternal;
 import android.hardware.display.DisplayViewport;
@@ -1457,7 +1456,7 @@
                 flags |= VIRTUAL_DISPLAY_FLAG_AUTO_MIRROR;
 
                 // Public displays can't be allowed to show content when locked.
-                if ((flags & VIRTUAL_DISPLAY_FLAG_SHOW_WITH_INSECURE_LOCKSCREEN) != 0) {
+                if ((flags & VIRTUAL_DISPLAY_FLAG_CAN_SHOW_WITH_INSECURE_KEYGUARD) != 0) {
                     throw new IllegalArgumentException(
                             "Public display must not be marked as SHOW_WHEN_LOCKED_INSECURE");
                 }