Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't log stacks for exceptions recieved from binder" am: 1b1d3d0939 am: d33950b173

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

Change-Id: I3261936edeb39b99fd374d4ea8ed62ba3feb98aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-04-04 23:36:54 +00:00
committed by Automerger Merge Worker
parent 2526e77983 d33950b173
commit 2dc7426c46
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/security/rkp/RemoteProvisioningRegistration.java
View File

@@ -70,12 +70,14 @@ final class RemoteProvisioningRegistration extends IRegistration.Stub {
Log.i(TAG, "Operation cancelled for client " + mCallback.hashCode()); Log.i(TAG, "Operation cancelled for client " + mCallback.hashCode());
wrapCallback(mCallback::onCancel); wrapCallback(mCallback::onCancel);
} else if (e instanceof RkpProxyException) { } 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; RkpProxyException rkpException = (RkpProxyException) e;
wrapCallback(() -> mCallback.onError(toGetKeyError(rkpException), wrapCallback(() -> mCallback.onError(toGetKeyError(rkpException),
e.getMessage())); e.getMessage()));
} else { } 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, wrapCallback(() -> mCallback.onError(IGetKeyCallback.ErrorCode.ERROR_UNKNOWN,
e.getMessage())); e.getMessage()));
} }