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

Commit 0fb5e07c 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:... 

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

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



Change-Id: Ic4dabb52ae1539f6ad53fbc825f0b2b4ab5a4a2f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2f44541 f5a7a4e9

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

+1 −1
Original line number Diff line number Diff line
@@ -4899,7 +4899,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);