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

Commit 2c739c94 authored by Arpan Kaphle's avatar Arpan Kaphle Committed by Android (Google) Code Review
Browse files

Merge "Capture new ApiStatus for Binder Death" into main

parents e7101f42 1c6efce1

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

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ abstract class RequestSession<T, U, V> implements CredentialManagerUi.Credential 
        @Override

        public void binderDied() {

            Slog.d(TAG, "Client binder died - clearing session");

            finishSession(isUiWaitingForData(), ApiStatus.CLIENT_CANCELED.getMetricCode());

            finishSession(isUiWaitingForData(), ApiStatus.BINDER_DIED.getMetricCode());

        }

    }

services/credentials/java/com/android/server/credentials/metrics/ApiStatus.java

+4 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package com.android.server.credentials.metrics;



import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_BINDER_DIED;

import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_CLIENT_CANCELED;

import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_FAILURE;

import static com.android.internal.util.FrameworkStatsLog.CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_SUCCESS;
@@ -27,7 +28,9 @@ public enum ApiStatus { 
    CLIENT_CANCELED(

            CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_CLIENT_CANCELED),

    USER_CANCELED(

            CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_USER_CANCELED);

            CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_USER_CANCELED),

    BINDER_DIED(

            CREDENTIAL_MANAGER_FINAL_PHASE_REPORTED__API_STATUS__API_STATUS_BINDER_DIED);



    private final int mInnerMetricCode;