Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve stopship to add P API level

Browse Source 
Bug: 64383815
Test: make docs
Change-Id: I317d976f4a360e9c52d4e5cc7dcc42b7c197b217
This commit is contained in:
Benjamin Franz
2017-09-01 13:47:22 +01:00
parent 8c6fe753dd
commit 64affcbf48
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/admin/DevicePolicyManager.java
View File

@@ -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.