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

Commit be4c36bc authored by Arpan Kaphle's avatar Arpan Kaphle
Browse files

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
parent 72913d7f

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;

        }