Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9f089b9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Resolve stopship to add P API level"

parents d27f7ffc 64affcbf

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

+1 −2
Original line number Diff line number Diff line
@@ -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.