Merge "Get rid of some unhelpful logs." into rvc-dev am: 1836bfb332 am: 74cf8f945f am: f48e3cb779 (374ffeb5) · Commits · e / os / android_frameworks_base

apex/blobstore/service/java/com/android/server/blob/BlobStoreSession.java

+11 −5

Original line number	Original line	Diff line number	Diff line
	@@ -347,12 +347,12 @@ class BlobStoreSession extends IBlobStoreSession.Stub {

	@Override		@Override
	public void close() {		public void close() {
	closeSession(STATE_CLOSED);		closeSession(STATE_CLOSED, false /* sendCallback */);
	}		}

	@Override		@Override
	public void abandon() {		public void abandon() {
	closeSession(STATE_ABANDONED);		closeSession(STATE_ABANDONED, true /* sendCallback */);
	}		}

	@Override		@Override
	@@ -360,11 +360,11 @@ class BlobStoreSession extends IBlobStoreSession.Stub {
	synchronized (mSessionLock) {		synchronized (mSessionLock) {
	mBlobCommitCallback = callback;		mBlobCommitCallback = callback;

	closeSession(STATE_COMMITTED);		closeSession(STATE_COMMITTED, true /* sendCallback */);
	}		}
	}		}

	private void closeSession(int state) {		private void closeSession(int state, boolean sendCallback) {
	assertCallerIsOwner();		assertCallerIsOwner();
	synchronized (mSessionLock) {		synchronized (mSessionLock) {
	if (mState != STATE_OPENED) {		if (mState != STATE_OPENED) {
	@@ -381,9 +381,11 @@ class BlobStoreSession extends IBlobStoreSession.Stub {
	mState = state;		mState = state;
	revokeAllFdsLocked();		revokeAllFdsLocked();

			if (sendCallback) {
	mListener.onStateChanged(this);		mListener.onStateChanged(this);
	}		}
	}		}
			}

	void computeDigest() {		void computeDigest() {
	try {		try {
	@@ -457,6 +459,10 @@ class BlobStoreSession extends IBlobStoreSession.Stub {
	return "<abandoned>";		return "<abandoned>";
	case STATE_COMMITTED:		case STATE_COMMITTED:
	return "<committed>";		return "<committed>";
			case STATE_VERIFIED_VALID:
			return "<verified_valid>";
			case STATE_VERIFIED_INVALID:
			return "<verified_invalid>";
	default:		default:
	Slog.wtf(TAG, "Unknown state: " + state);		Slog.wtf(TAG, "Unknown state: " + state);
	return "<unknown>";		return "<unknown>";