From 64affcbf48e1b707fabd5b6e4c974817ed2b697c Mon Sep 17 00:00:00 2001
From: Benjamin Franz <bfranz@google.com>
Date: Fri, 1 Sep 2017 13:47:22 +0100
Subject: [PATCH] Resolve stopship to add P API level

Bug: 64383815
Test: make docs
Change-Id: I317d976f4a360e9c52d4e5cc7dcc42b7c197b217
---
 core/java/android/app/admin/DevicePolicyManager.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9e95157b1fc32..833af1b538d09 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6784,7 +6784,6 @@ public class DevicePolicyManager {
         return null;
     }
 
-    // STOPSHIP: Remove reference to CUR_DEVELOPMENT before shipping
     /**
      * Called by a device owner to disable the keyguard altogether.
      * <p>
@@ -6794,7 +6793,7 @@ public class DevicePolicyManager {
      * disabled.
      *
      * <p>
-     * As of {@link android.os.Build.VERSION_CODES#CUR_DEVELOPMENT}, this call also dismisses the
+     * As of {@link android.os.Build.VERSION_CODES#P}, this call also dismisses the
      * keyguard if it is currently shown.
      *
      * @param admin Which {@link DeviceAdminReceiver} this request is associated with.