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

Commit 9bab1012 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't log stacks for exceptions recieved from binder" am: 1b1d3d09... 

Merge "Don't log stacks for exceptions recieved from binder" am: 1b1d3d09 am: d33950b1 am: 2dc7426c am: a707b61c

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



Change-Id: If6d9fe671f15f7037ca9c52bf77b4a14ff2a6443
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8b2c0107 a707b61c

services/core/java/com/android/server/security/rkp/RemoteProvisioningRegistration.java

+4 −2
Original line number Diff line number Diff line
@@ -70,12 +70,14 @@ final class RemoteProvisioningRegistration extends IRegistration.Stub { 
                Log.i(TAG, "Operation cancelled for client " + mCallback.hashCode());

                wrapCallback(mCallback::onCancel);

            } else if (e instanceof RkpProxyException) {

                Log.e(TAG, "RKP error fetching key for client " + mCallback.hashCode(), e);

                Log.e(TAG, "RKP error fetching key for client " + mCallback.hashCode() + ": "

                        + e.getMessage());

                RkpProxyException rkpException = (RkpProxyException) e;

                wrapCallback(() -> mCallback.onError(toGetKeyError(rkpException),

                        e.getMessage()));

            } else {

                Log.e(TAG, "Error fetching key for client " + mCallback.hashCode(), e);

                Log.e(TAG, "Unknown error fetching key for client " + mCallback.hashCode() + ": "

                        + e.getMessage());

                wrapCallback(() -> mCallback.onError(IGetKeyCallback.ErrorCode.ERROR_UNKNOWN,

                        e.getMessage()));

            }