Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Ensure candidate phase logged in split branch" into udc-dev

Browse Source
This commit is contained in:
Arpan Kaphle
2023-04-04 23:28:36 +00:00
committed by Android (Google) Code Review
parent 2e0f3af103 be4c36bc35
commit d3a95bbce7
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/credentials/java/com/android/server/credentials/RequestSession.java
View File

@@ -194,7 +194,6 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential
ArrayList<ProviderData> providerDataList = getProviderDataForUi(); ArrayList<ProviderData> providerDataList = getProviderDataForUi();
if (!providerDataList.isEmpty()) { if (!providerDataList.isEmpty()) {
Log.i(TAG, "provider list not empty about to initiate ui"); Log.i(TAG, "provider list not empty about to initiate ui");
mRequestSessionMetric.logCandidatePhaseMetrics(mProviders);
launchUiWithProviderData(providerDataList); launchUiWithProviderData(providerDataList);
} }
} }
@@ -204,9 +203,9 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential
Log.i(TAG, "In getProviderDataAndInitiateUi"); Log.i(TAG, "In getProviderDataAndInitiateUi");
Log.i(TAG, "In getProviderDataAndInitiateUi providers size: " + mProviders.size()); Log.i(TAG, "In getProviderDataAndInitiateUi providers size: " + mProviders.size());
ArrayList<ProviderData> providerDataList = new ArrayList<>(); ArrayList<ProviderData> providerDataList = new ArrayList<>();
mRequestSessionMetric.logCandidatePhaseMetrics(mProviders);
if (isSessionCancelled()) { if (isSessionCancelled()) {
mRequestSessionMetric.logCandidatePhaseMetrics(mProviders);
finishSession(/*propagateCancellation=*/true); finishSession(/*propagateCancellation=*/true);
return providerDataList; return providerDataList;
} }