From 45428d5c51425ea7431e60b81bf4fa5b821df0b6 Mon Sep 17 00:00:00 2001 From: Beverly Date: Tue, 11 Apr 2023 16:46:34 +0000 Subject: [PATCH] Log UiEvent for newlyUnlocked trustGranted events Test: manual Fixes: 271452684 Change-Id: I7be11a751d6964ad834761ddb04fa6435278b0d5 --- .../keyguard/KeyguardUpdateMonitor.java | 9 +++++++ .../shared/constants/TrustAgentUiEvent.kt | 25 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/TrustAgentUiEvent.kt diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java index 33a8224408660..97102dd7ddf55 100644 --- a/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java +++ b/packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java @@ -156,6 +156,7 @@ import com.android.systemui.dump.DumpManager; import com.android.systemui.dump.DumpsysTableLogger; import com.android.systemui.keyguard.domain.interactor.FaceAuthenticationListener; import com.android.systemui.keyguard.domain.interactor.KeyguardFaceAuthInteractor; +import com.android.systemui.keyguard.shared.constants.TrustAgentUiEvent; import com.android.systemui.keyguard.shared.model.AcquiredAuthenticationStatus; import com.android.systemui.keyguard.shared.model.AuthenticationStatus; import com.android.systemui.keyguard.shared.model.DetectionStatus; @@ -537,6 +538,14 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab mLogger.logTrustGrantedWithFlags(flags, newlyUnlocked, userId, message); if (userId == getCurrentUser()) { + if (newlyUnlocked) { + // if this callback is ever removed, this should then be logged in + // TrustRepository + mUiEventLogger.log( + TrustAgentUiEvent.TRUST_AGENT_NEWLY_UNLOCKED, + getKeyguardSessionId() + ); + } final TrustGrantFlags trustGrantFlags = new TrustGrantFlags(flags); for (int i = 0; i < mCallbacks.size(); i++) { KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get(); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/TrustAgentUiEvent.kt b/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/TrustAgentUiEvent.kt new file mode 100644 index 0000000000000..ef6079fbc25b0 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/keyguard/shared/constants/TrustAgentUiEvent.kt @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2023 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.keyguard.shared.constants + +import com.android.internal.logging.UiEvent +import com.android.internal.logging.UiEventLogger + +enum class TrustAgentUiEvent(private val metricId: Int) : UiEventLogger.UiEventEnum { + @UiEvent(doc = "TrustAgent newly unlocked the device") TRUST_AGENT_NEWLY_UNLOCKED(1361); + override fun getId() = metricId +}