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

Commit c0102491 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: I5e74262d04a32f0795651fc8c53308148916d0f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fc47618c 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;

        }