Merge "Gracefully failing Exceptions during logging" into udc-dev am: 6789d00256

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

Change-Id: I42875eca99c6e55c3636381bf5db56f2d8dfe360
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Arpan Kaphle
2023-03-08 21:51:39 +00:00
committed by Automerger Merge Worker

View File

@@ -90,6 +90,7 @@ public class MetricUtilities {
protected static void logApiCalled(ApiName apiName, ApiStatus apiStatus, protected static void logApiCalled(ApiName apiName, ApiStatus apiStatus,
Map<String, ProviderSession> providers, int callingUid, Map<String, ProviderSession> providers, int callingUid,
ChosenProviderMetric chosenProviderMetric) { ChosenProviderMetric chosenProviderMetric) {
try {
var providerSessions = providers.values(); var providerSessions = providers.values();
int providerSize = providerSessions.size(); int providerSize = providerSessions.size();
int[] candidateUidList = new int[providerSize]; int[] candidateUidList = new int[providerSize];
@@ -117,6 +118,9 @@ public class MetricUtilities {
/* chosen_provider_final_phase_microseconds (backwards compat only) */ /* chosen_provider_final_phase_microseconds (backwards compat only) */
DEFAULT_INT_32, DEFAULT_INT_32,
/* chosen_provider_status */ chosenProviderMetric.getChosenProviderStatus()); /* chosen_provider_status */ chosenProviderMetric.getChosenProviderStatus());
} catch (Exception e) {
Log.w(TAG, "Unexpected error during metric logging: " + e);
}
} }
/** /**
@@ -131,6 +135,7 @@ public class MetricUtilities {
*/ */
protected static void logApiCalled(ApiName apiName, ApiStatus apiStatus, protected static void logApiCalled(ApiName apiName, ApiStatus apiStatus,
int callingUid) { int callingUid) {
try {
FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_API_CALLED, FrameworkStatsLog.write(FrameworkStatsLog.CREDENTIAL_MANAGER_API_CALLED,
/* api_name */apiName.getMetricCode(), /* api_name */apiName.getMetricCode(),
/* caller_uid */ callingUid, /* caller_uid */ callingUid,
@@ -145,6 +150,9 @@ public class MetricUtilities {
/* chosen_provider_final_phase_microseconds */ /* chosen_provider_final_phase_microseconds */
DEFAULT_INT_32, DEFAULT_INT_32,
/* chosen_provider_status */ DEFAULT_INT_32); /* chosen_provider_status */ DEFAULT_INT_32);
} catch (Exception e) {
Log.w(TAG, "Unexpected error during metric logging: " + e);
}
} }
} }