From 9bec4c449b081e959dd7338cdaa4275cfa9612c3 Mon Sep 17 00:00:00 2001
From: Pavel Grafov <pgrafov@google.com>
Date: Wed, 20 May 2020 13:15:52 +0100
Subject: [PATCH] Put @LockSettingsTest back into blocking presubmit.

The tests have been stable recently.

Bug: 135979609
Test: presubmit
Change-Id: I77abb35e8e7a0811afb66f9fb487a81a99f8765b
---
 cmds/locksettings/TEST_MAPPING                                  | 2 +-
 services/core/java/com/android/server/locksettings/TEST_MAPPING | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmds/locksettings/TEST_MAPPING b/cmds/locksettings/TEST_MAPPING
index 56f5cc034f053..c1cba5f7f22d3 100644
--- a/cmds/locksettings/TEST_MAPPING
+++ b/cmds/locksettings/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-    "presubmit-devicepolicy": [
+    "presubmit": [
         {
             "name": "CtsDevicePolicyManagerTestCases",
             "options": [
diff --git a/services/core/java/com/android/server/locksettings/TEST_MAPPING b/services/core/java/com/android/server/locksettings/TEST_MAPPING
index 56f5cc034f053..c1cba5f7f22d3 100644
--- a/services/core/java/com/android/server/locksettings/TEST_MAPPING
+++ b/services/core/java/com/android/server/locksettings/TEST_MAPPING
@@ -1,5 +1,5 @@
 {
-    "presubmit-devicepolicy": [
+    "presubmit": [
         {
             "name": "CtsDevicePolicyManagerTestCases",
             "options": [