Skip to content

Commit d74c2db

Browse files
Michal KarpinskiRubin Xu
authored andcommitted
[TestDPC] Adjusting logging calls after unifying naming to security logging
Bug: 27532425 Change-Id: Iae5225e4be520eff5836b9eaeca34726ceef8d51
1 parent 57d5597 commit d74c2db

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

app/src/main/java/com/afwsamples/testdpc/policy/PolicyManagementFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -689,7 +689,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
689689
reloadCameraDisableUi();
690690
return true;
691691
case ENABLE_PROCESS_LOGGING:
692-
mDevicePolicyManager.setDeviceLoggingEnabled(mAdminComponentName,
692+
mDevicePolicyManager.setSecurityLoggingEnabled(mAdminComponentName,
693693
(Boolean) newValue);
694694
reloadEnableProcessLoggingUi();
695695
return true;
@@ -1319,7 +1319,7 @@ private void reloadCameraDisableUi() {
13191319

13201320
private void reloadEnableProcessLoggingUi() {
13211321
if (mEnableProcessLoggingPreference.isEnabled()) {
1322-
boolean isProcessLoggingEnabled = mDevicePolicyManager.getDeviceLoggingEnabled(
1322+
boolean isProcessLoggingEnabled = mDevicePolicyManager.isSecurityLoggingEnabled(
13231323
mAdminComponentName);
13241324
mEnableProcessLoggingPreference.setChecked(isProcessLoggingEnabled);
13251325
findPreference(REQUEST_PROCESS_LOGS).setEnabled(isProcessLoggingEnabled);

app/src/main/java/com/afwsamples/testdpc/policy/ProcessLogsFragment.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.app.ListFragment;
44
import android.app.admin.DevicePolicyManager;
5-
import android.auditing.SecurityLog;
6-
import android.auditing.SecurityLog.SecurityEvent;
5+
import android.app.admin.SecurityLog;
6+
import android.app.admin.SecurityLog.SecurityEvent;
77
import android.content.ComponentName;
88
import android.content.Context;
99
import android.os.Bundle;
@@ -45,7 +45,7 @@ public void onCreate(Bundle savedInstanceState) {
4545
public void onActivityCreated(Bundle savedInstanceState) {
4646
super.onActivityCreated(savedInstanceState);
4747
mAdapter.add(getString(R.string.process_logs_retrieved_message, new Date().toString()));
48-
processEvents(mDevicePolicyManager.retrieveDeviceLogs(mAdminName));
48+
processEvents(mDevicePolicyManager.retrieveSecurityLogs(mAdminName));
4949
}
5050

5151
@Override

0 commit comments

Comments
 (0)