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

Commit c37bf2a8 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Fix missed running update-api"

parents b9db146d 72c16de7
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -5194,7 +5194,7 @@ package android.app.admin {
    method public java.lang.CharSequence onDisableRequested(android.content.Context, android.content.Intent);
    method public void onDisabled(android.content.Context, android.content.Intent);
    method public void onEnabled(android.content.Context, android.content.Intent);
    method public void onLockTaskModeChanged(android.content.Context, android.content.Intent);
    method public void onLockTaskModeChanged(android.content.Context, android.content.Intent, boolean, java.lang.String);
    method public void onPasswordChanged(android.content.Context, android.content.Intent);
    method public void onPasswordExpiring(android.content.Context, android.content.Intent);
    method public void onPasswordFailed(android.content.Context, android.content.Intent);
@@ -5213,6 +5213,7 @@ package android.app.admin {
    field public static final java.lang.String DEVICE_ADMIN_META_DATA = "android.app.device_admin";
    field public static final java.lang.String EXTRA_DISABLE_WARNING = "android.app.extra.DISABLE_WARNING";
    field public static final java.lang.String EXTRA_LOCK_TASK_ENTERING = "android.app.extra.LOCK_TASK_ENTERING";
    field public static final java.lang.String EXTRA_LOCK_TASK_PACKAGE = "android.app.extra.LOCK_TASK_PACKAGE";
  }
  public class DevicePolicyManager {