From 070e3d6ce3c7898bdd0d40abb338ea80c0d3e36f Mon Sep 17 00:00:00 2001
From: Eric Biggers <ebiggers@google.com>
Date: Mon, 27 Feb 2023 19:20:44 +0000
Subject: [PATCH] locksettings: clean up logging of cached GK password
 expiration

When a cached GK password expires, use a much clearer log message.
Also, don't log anything if the GK password was already explicitly
removed by LockSettingsService.removeGatekeeperPasswordHandle().

Bug: 268526331
Change-Id: I734c9115bd8ea0a44ed6c03754e87341848a00f5
---
 .../android/server/locksettings/LockSettingsService.java   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/locksettings/LockSettingsService.java b/services/core/java/com/android/server/locksettings/LockSettingsService.java
index 718a773cacf6e..6c2f75416f6df 100644
--- a/services/core/java/com/android/server/locksettings/LockSettingsService.java
+++ b/services/core/java/com/android/server/locksettings/LockSettingsService.java
@@ -2717,8 +2717,11 @@ public class LockSettingsService extends ILockSettings.Stub {
         final long finalHandle = handle;
         mHandler.postDelayed(() -> {
             synchronized (mGatekeeperPasswords) {
-                Slog.d(TAG, "Removing handle: " + finalHandle);
-                mGatekeeperPasswords.remove(finalHandle);
+                if (mGatekeeperPasswords.get(finalHandle) != null) {
+                    Slogf.d(TAG, "Cached Gatekeeper password with handle %016x has expired",
+                            finalHandle);
+                    mGatekeeperPasswords.remove(finalHandle);
+                }
             }
         }, GK_PW_HANDLE_STORE_DURATION_MS);