From 779aad942f73bd603ed50c160db21f984ed6e8b9 Mon Sep 17 00:00:00 2001 From: Michal Karpinski Date: Wed, 20 Jan 2016 11:56:22 +0000 Subject: [PATCH] Logging of unlock attempts and device locking to security log Bug: 22860162 Change-Id: Ice18a8f655030e52ae2d9e256b6120e5f87950c5 --- .../android/keyguard/KeyguardSecurityContainer.java | 6 ++++++ .../systemui/keyguard/KeyguardViewMediator.java | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java index 409f6a700ff3c..c7d17dc221bfb 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java @@ -18,6 +18,7 @@ package com.android.keyguard; import android.app.Activity; import android.app.AlertDialog; import android.app.admin.DevicePolicyManager; +import android.auditing.SecurityLog; import android.content.Context; import android.os.UserHandle; import android.util.AttributeSet; @@ -423,6 +424,11 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe } public void reportUnlockAttempt(int userId, boolean success, int timeoutMs) { + if (SecurityLog.isLoggingEnabled()) { + SecurityLog.writeEvent(SecurityLog.TAG_DEVICE_UNLOCK_ATTEMPT, + (success ? 1 : 0), + mCurrentSecuritySelection.name()); + } KeyguardUpdateMonitor monitor = KeyguardUpdateMonitor.getInstance(mContext); if (success) { monitor.clearFailedUnlockAttempts(); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 9a00b4b906c41..704de97a2fa80 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -24,6 +24,7 @@ import android.app.PendingIntent; import android.app.SearchManager; import android.app.StatusBarManager; import android.app.trust.TrustManager; +import android.auditing.SecurityLog; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -1352,6 +1353,11 @@ public class KeyguardViewMediator extends SystemUI { * @see #KEYGUARD_DONE */ private void handleKeyguardDone(boolean authenticated) { + if (SecurityLog.isLoggingEnabled() + && mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser())) { + SecurityLog.writeEvent(SecurityLog.TAG_DEVICE_UNLOCK_ATTEMPT, + (authenticated ? 1 : 0), "Unknown"); + } if (DEBUG) Log.d(TAG, "handleKeyguardDone"); synchronized (this) { resetKeyguardDonePendingLocked(); @@ -1463,6 +1469,10 @@ public class KeyguardViewMediator extends SystemUI { * @see #SHOW */ private void handleShow(Bundle options) { + if (SecurityLog.isLoggingEnabled() + && mLockPatternUtils.isSecure(KeyguardUpdateMonitor.getCurrentUser())) { + SecurityLog.writeEvent(SecurityLog.TAG_DEVICE_LOCKED, ""); + } synchronized (KeyguardViewMediator.this) { if (!mSystemReady) { if (DEBUG) Log.d(TAG, "ignoring handleShow because system is not ready.");