Merge "Use DevicePolicyManager#isSecurityLoggingEnabled"

This commit is contained in:
TreeHugger Robot
2017-03-24 19:11:08 +00:00
committed by Android (Google) Code Review

View File

@@ -19,7 +19,6 @@ package com.android.settings.enterprise;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.app.admin.DevicePolicyManager; import android.app.admin.DevicePolicyManager;
import android.content.ComponentName; import android.content.ComponentName;
import android.os.SystemProperties;
import android.os.UserHandle; import android.os.UserHandle;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
@@ -70,9 +69,7 @@ public class DevicePolicyManagerWrapperImpl implements DevicePolicyManagerWrappe
@Override @Override
public boolean isSecurityLoggingEnabled(@Nullable ComponentName admin) { public boolean isSecurityLoggingEnabled(@Nullable ComponentName admin) {
// TODO(b/36584321): Switch to DevicePolicyManager#isSecurityLoggingEnabled once that is return mDpm.isSecurityLoggingEnabled(admin);
// callable by the system.
return SystemProperties.getBoolean("persist.logd.security", false);
} }
@Override @Override