From be4c36bc35d1ee30ca205634c6ef4f90ec6d44ff Mon Sep 17 00:00:00 2001 From: Arpan Kaphle Date: Tue, 4 Apr 2023 20:25:28 +0000 Subject: [PATCH] Ensure candidate phase logged in split branch There's a chunk of code where the candidate phase should be logged that splits into a fork, where a cancellation may have occured, or not. Previously, only one fork was followed. Now both will be followed. Bug: 275067595 Test: Builds + E2E Test of Functionality Change-Id: I5e1308ae3dfe66f8434fc1b337a9445c951b8bb8 --- .../java/com/android/server/credentials/RequestSession.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/services/credentials/java/com/android/server/credentials/RequestSession.java b/services/credentials/java/com/android/server/credentials/RequestSession.java index cfb9ad46812d8..04c4bc4c7c4f5 100644 --- a/services/credentials/java/com/android/server/credentials/RequestSession.java +++ b/services/credentials/java/com/android/server/credentials/RequestSession.java @@ -194,7 +194,6 @@ abstract class RequestSession implements CredentialManagerUi.Credential ArrayList providerDataList = getProviderDataForUi(); if (!providerDataList.isEmpty()) { Log.i(TAG, "provider list not empty about to initiate ui"); - mRequestSessionMetric.logCandidatePhaseMetrics(mProviders); launchUiWithProviderData(providerDataList); } } @@ -204,9 +203,9 @@ abstract class RequestSession implements CredentialManagerUi.Credential Log.i(TAG, "In getProviderDataAndInitiateUi"); Log.i(TAG, "In getProviderDataAndInitiateUi providers size: " + mProviders.size()); ArrayList providerDataList = new ArrayList<>(); + mRequestSessionMetric.logCandidatePhaseMetrics(mProviders); if (isSessionCancelled()) { - mRequestSessionMetric.logCandidatePhaseMetrics(mProviders); finishSession(/*propagateCancellation=*/true); return providerDataList; }