diff options
author | Sudheer Shanka <sudheersai@google.com> | 2020-03-04 23:23:54 -0800 |
---|---|---|
committer | Sudheer Shanka <sudheersai@google.com> | 2020-03-04 23:33:29 -0800 |
commit | b5239e4a7470eacf6e6db5ea0f8ae3f32803f545 (patch) | |
tree | c9302009dbedc7d998674a5c26003c49892189f7 /apex/blobstore | |
parent | 2e7834d39e7159b903f89ef315db49ffc64e894b (diff) |
Get rid of some unhelpful logs.
Fixes: 150833185
Test: atest --test-mapping apex/blobstore
Change-Id: I1926df9b79b712448e498c6467545a50f852c7e6
Diffstat (limited to 'apex/blobstore')
-rw-r--r-- | apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java | 16 |
1 files changed, 11 insertions, 5 deletions
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 cc4044ed46b9..62701e52781d 100644 --- a/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java +++ b/apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java @@ -347,12 +347,12 @@ class BlobStoreSession extends IBlobStoreSession.Stub { @Override public void close() { - closeSession(STATE_CLOSED); + closeSession(STATE_CLOSED, false /* sendCallback */); } @Override public void abandon() { - closeSession(STATE_ABANDONED); + closeSession(STATE_ABANDONED, true /* sendCallback */); } @Override @@ -360,11 +360,11 @@ class BlobStoreSession extends IBlobStoreSession.Stub { synchronized (mSessionLock) { mBlobCommitCallback = callback; - closeSession(STATE_COMMITTED); + closeSession(STATE_COMMITTED, true /* sendCallback */); } } - private void closeSession(int state) { + private void closeSession(int state, boolean sendCallback) { assertCallerIsOwner(); synchronized (mSessionLock) { if (mState != STATE_OPENED) { @@ -381,7 +381,9 @@ class BlobStoreSession extends IBlobStoreSession.Stub { mState = state; revokeAllFdsLocked(); - mListener.onStateChanged(this); + if (sendCallback) { + mListener.onStateChanged(this); + } } } @@ -457,6 +459,10 @@ class BlobStoreSession extends IBlobStoreSession.Stub { return "<abandoned>"; case STATE_COMMITTED: return "<committed>"; + case STATE_VERIFIED_VALID: + return "<verified_valid>"; + case STATE_VERIFIED_INVALID: + return "<verified_invalid>"; default: Slog.wtf(TAG, "Unknown state: " + state); return "<unknown>"; |