diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 98d356b5a9211..e7427bfabe016 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -5829,14 +5829,6 @@ public class DevicePolicyManager { } } - /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public void setDeviceLoggingEnabled(@NonNull ComponentName admin, boolean enabled) { - setSecurityLoggingEnabled(admin, enabled); - } - /** * Return whether security logging is enabled or not by the device owner. * @@ -5855,14 +5847,6 @@ public class DevicePolicyManager { } } - /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public boolean getDeviceLoggingEnabled(@NonNull ComponentName admin) { - return isSecurityLoggingEnabled(admin); - } - /** * Called by device owner to retrieve all new security logging entries since the last call to * this API after device boots. @@ -5892,14 +5876,6 @@ public class DevicePolicyManager { } } - /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public List retrieveDeviceLogs(@NonNull ComponentName admin) { - return retrieveSecurityLogs(admin); - } - /** * Called by the system to obtain a {@link DevicePolicyManager} whose calls act on the parent * profile. @@ -5940,14 +5916,6 @@ public class DevicePolicyManager { } } - /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public List retrievePreviousDeviceLogs(@NonNull ComponentName admin) { - return retrievePreRebootSecurityLogs(admin); - } - /** * Called by a profile owner of a managed profile to set the color used for customization. This * color is used as background color of the confirm credentials screen for that user. The