diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2020-06-05 15:36:37 -0700 |
|---|---|---|
| committer | Sudheer Shanka <sudheersai@google.com> | 2020-06-08 10:52:46 -0700 |
| commit | 1680642413100a4d0af9a724f32ba3f7d12e92f1 (patch) | |
| tree | a15e1c55710b8dcfb46ca6b1847cc53fb2b9f677 /apex/blobstore/service | |
| parent | edcb2c38f4a06fbc4fe786e3a5f441d0ef69b55c (diff) | |
Log the error when committing the blob fails.
Bug: 158332607
Test: atest --test-mapping apex/blobstore
Change-Id: I5a7cf24b7b3d6a7b33ef18e20f7a0245857f5011
Diffstat (limited to 'apex/blobstore/service')
| -rw-r--r-- | apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java | 1 | ||||
| -rw-r--r-- | apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java index a2bce31fc7b2..0bedd00bfb6e 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java @@ -592,6 +592,7 @@ public class BlobStoreManagerService extends SystemService { } else { blob.addOrReplaceCommitter(existingCommitter); } + Slog.d(TAG, "Error committing the blob", e); session.sendCommitCallbackResult(COMMIT_RESULT_ERROR); } getUserSessionsLocked(UserHandle.getUserId(session.getOwnerUid())) diff --git a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java index 62701e52781d..581135d8fe41 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java @@ -27,7 +27,6 @@ import static android.system.OsConstants.O_RDONLY; import static android.system.OsConstants.O_RDWR; import static android.system.OsConstants.SEEK_SET; -import static com.android.server.blob.BlobStoreConfig.LOGV; import static com.android.server.blob.BlobStoreConfig.TAG; import android.annotation.BytesLong; @@ -405,9 +404,10 @@ class BlobStoreSession extends IBlobStoreSession.Stub { mState = STATE_VERIFIED_VALID; // Commit callback will be sent once the data is persisted. } else { - if (LOGV) { - Slog.v(TAG, "Digest of the data didn't match the given BlobHandle.digest"); - } + Slog.d(TAG, "Digest of the data (" + + (mDataDigest == null ? "null" : BlobHandle.safeDigest(mDataDigest)) + + ") didn't match the given BlobHandle.digest (" + + BlobHandle.safeDigest(mBlobHandle.digest) + ")"); mState = STATE_VERIFIED_INVALID; sendCommitCallbackResult(COMMIT_RESULT_ERROR); } |