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

Merge "Get rid of some unhelpful logs." into rvc-dev am: 1836bfb332

Browse Source 
Change-Id: Ibd732d18446db508e61862f3389ad24d2efdbe3e
This commit is contained in:
Automerger Merge Worker
2020-03-05 20:43:50 +00:00
parent d7ddaef494 1836bfb332
commit 14711a6768
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java
View File

@@ -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>";