Merge "[TestDPC] Adjusting logging calls after unifying naming to security logging" into ub-testdpc-nyc

Author: Sudheer Shanka

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

@@ -694,7 +694,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 reloadCameraDisableUi();
                 return true;
             case ENABLE_PROCESS_LOGGING:
-                mDevicePolicyManager.setDeviceLoggingEnabled(mAdminComponentName,
+                mDevicePolicyManager.setSecurityLoggingEnabled(mAdminComponentName,
                         (Boolean) newValue);
                 reloadEnableProcessLoggingUi();
                 return true;
@@ -1324,7 +1324,7 @@ private void reloadCameraDisableUi() {
 
     private void reloadEnableProcessLoggingUi() {
         if (mEnableProcessLoggingPreference.isEnabled()) {
-            boolean isProcessLoggingEnabled = mDevicePolicyManager.getDeviceLoggingEnabled(
+            boolean isProcessLoggingEnabled = mDevicePolicyManager.isSecurityLoggingEnabled(
                     mAdminComponentName);
             mEnableProcessLoggingPreference.setChecked(isProcessLoggingEnabled);
             findPreference(REQUEST_PROCESS_LOGS).setEnabled(isProcessLoggingEnabled);

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

@@ -2,8 +2,8 @@
 
 import android.app.ListFragment;
 import android.app.admin.DevicePolicyManager;
-import android.auditing.SecurityLog;
-import android.auditing.SecurityLog.SecurityEvent;
+import android.app.admin.SecurityLog;
+import android.app.admin.SecurityLog.SecurityEvent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.os.Bundle;
@@ -45,7 +45,7 @@ public void onCreate(Bundle savedInstanceState) {
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         mAdapter.add(getString(R.string.process_logs_retrieved_message, new Date().toString()));
-        processEvents(mDevicePolicyManager.retrieveDeviceLogs(mAdminName));
+        processEvents(mDevicePolicyManager.retrieveSecurityLogs(mAdminName));
     }
 
     @Override