From 74ddcfb06bb13c21ddd6a7405148084ff771089e Mon Sep 17 00:00:00 2001
From: Sudheer Shanka <sudheersai@google.com>
Date: Thu, 25 Jun 2020 04:11:24 -0700
Subject: [PATCH] Update commit/lease failure reasons for atoms logging.

Bug: 144155167
Bug: 159754450
Test: atest --test-mapping apex/blobstore
Change-Id: I2f511e00084f5b28db60a83c3237536181f5eb35
---
 .../com/android/server/blob/BlobStoreManagerService.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 d9c0e478f1e34..520e8bbf9f932 100644
--- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
+++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
@@ -459,6 +459,9 @@ public class BlobStoreManagerService extends SystemService {
         synchronized (mBlobsLock) {
             final int leasesCount = getLeasedBlobsCountLocked(callingUid, callingPackage);
             if (leasesCount >= getMaxLeasedBlobs()) {
+                FrameworkStatsLog.write(FrameworkStatsLog.BLOB_LEASED, callingUid,
+                        INVALID_BLOB_ID, INVALID_BLOB_SIZE,
+                        FrameworkStatsLog.BLOB_LEASED__RESULT__COUNT_LIMIT_EXCEEDED);
                 throw new LimitExceededException("Too many leased blobs for the caller: "
                         + leasesCount);
             }
@@ -691,6 +694,9 @@ public class BlobStoreManagerService extends SystemService {
                         deleteSessionLocked(session);
                         getUserSessionsLocked(UserHandle.getUserId(session.getOwnerUid()))
                                 .remove(session.getSessionId());
+                        FrameworkStatsLog.write(FrameworkStatsLog.BLOB_COMMITTED,
+                                session.getOwnerUid(), session.getSessionId(), session.getSize(),
+                                FrameworkStatsLog.BLOB_COMMITTED__RESULT__COUNT_LIMIT_EXCEEDED);
                         break;
                     }
                     final int userId = UserHandle.getUserId(session.getOwnerUid());
@@ -725,7 +731,7 @@ public class BlobStoreManagerService extends SystemService {
                         }
                         Slog.d(TAG, "Error committing the blob: " + session, e);
                         FrameworkStatsLog.write(FrameworkStatsLog.BLOB_COMMITTED,
-                                session.getOwnerUid(), blob.getBlobId(), blob.getSize(),
+                                session.getOwnerUid(), session.getSessionId(), blob.getSize(),
                                 FrameworkStatsLog.BLOB_COMMITTED__RESULT__ERROR_DURING_COMMIT);
                         session.sendCommitCallbackResult(COMMIT_RESULT_ERROR);
                         // If the commit fails and this blob data didn't exist before, delete it.