Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b65db243 authored by Arpan Kaphle's avatar Arpan Kaphle Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22461986



Change-Id: I994fec6d9431744020f8cc0b480c1cc9e634539e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85c30fac d3a95bbc

services/credentials/java/com/android/server/credentials/RequestSession.java

+1 −2
Original line number Diff line number Diff line
@@ -194,7 +194,6 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential 
        ArrayList<ProviderData> 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<T, U, V> implements CredentialManagerUi.Credential 
        Log.i(TAG, "In getProviderDataAndInitiateUi");

        Log.i(TAG, "In getProviderDataAndInitiateUi providers size: " + mProviders.size());

        ArrayList<ProviderData> providerDataList = new ArrayList<>();

        mRequestSessionMetric.logCandidatePhaseMetrics(mProviders);



        if (isSessionCancelled()) {

            mRequestSessionMetric.logCandidatePhaseMetrics(mProviders);

            finishSession(/*propagateCancellation=*/true);

            return providerDataList;

        }