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

Commit f5a7a4e9 authored by Catherine Vlasov's avatar Catherine Vlasov Committed by Automerger Merge Worker
Browse files

Merge "Log the atom tag when pulling a Keystore atom fails." into main am: 272d18f7 

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



Change-Id: I88da0dc9fa125a2648d20b67c134f904ee6979da
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 64c21f76 272d18f7

services/core/java/com/android/server/stats/pull/StatsPullAtomService.java

+1 −1
Original line number Diff line number Diff line
@@ -4853,7 +4853,7 @@ public class StatsPullAtomService extends SystemService { 
            Slog.e(TAG, "Disconnected from keystore service. Cannot pull.", e);

            return StatsManager.PULL_SKIP;

        } catch (ServiceSpecificException e) {

            Slog.e(TAG, "pulling keystore metrics failed", e);

            Slog.e(TAG, "Pulling keystore atom with tag " + atomTag + " failed", e);

            return StatsManager.PULL_SKIP;

        } finally {

            Binder.restoreCallingIdentity(callingToken);