commit 64affcbf48e1b707fabd5b6e4c974817ed2b697c
author Benjamin Franz <bfranz@google.com> Fri Sep 01 13:47:22 2017 +0100
committer Benjamin Franz <bfranz@google.com> Fri Sep 01 13:53:05 2017 +0100
tree f22011f6c38f66bde5c8f940c042c1a8354ba52e
parent 8c6fe753dd89985400c4ce0181916ae8db6bb872

Resolve stopship to add P API level

Bug: 64383815
Test: make docs
Change-Id: I317d976f4a360e9c52d4e5cc7dcc42b7c197b217

core/java/android/app/admin/DevicePolicyManager.java

diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java
index 9e95157..833af1b 100644
--- a/core/java/android/app/admin/DevicePolicyManager.java
+++ b/core/java/android/app/admin/DevicePolicyManager.java
@@ -6784,7 +6784,6 @@
         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 @@
      * 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.