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

Merge "Update commit/lease failure reasons for atoms logging." into rvc-dev am: 6452044f56

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

Change-Id: I5ee13ebbb041867af3cc70db66a998e41dd2669e
This commit is contained in:
Sudheer Shanka
2020-06-27 10:23:01 +00:00
committed by Automerger Merge Worker
parent 2c8d76e130 6452044f56
commit 8ec56e2226
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apex/blobstore/service/java/com/android/server/blob/BlobStoreManagerService.java
View File

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