diff options
| author | 2017-09-01 13:47:22 +0100 | |
|---|---|---|
| committer | 2017-09-01 13:53:05 +0100 | |
| commit | 64affcbf48e1b707fabd5b6e4c974817ed2b697c (patch) | |
| tree | f22011f6c38f66bde5c8f940c042c1a8354ba52e | |
| parent | 8c6fe753dd89985400c4ce0181916ae8db6bb872 (diff) | |
Resolve stopship to add P API level
Bug: 64383815
Test: make docs
Change-Id: I317d976f4a360e9c52d4e5cc7dcc42b7c197b217
| -rw-r--r-- | core/java/android/app/admin/DevicePolicyManager.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 9e95157b1fc3..833af1b538d0 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. |