Merge "don't call methods doing database lock from a synchronized block" (cd7f5981) · Commits · e / os / android_frameworks_base

core/java/android/database/sqlite/SQLiteClosable.java

+10 −8

Original line number	Diff line number	Diff line
		@@ -38,20 +38,22 @@ public abstract class SQLiteClosable {
		}

		public void releaseReference() {
		boolean refCountIsZero = false;
		synchronized(this) {
		mReferenceCount--;
		if (mReferenceCount == 0) {
		onAllReferencesReleased();
		refCountIsZero = --mReferenceCount == 0;
		}
		if (refCountIsZero) {
		onAllReferencesReleased();
		}
		}

		public void releaseReferenceFromContainer() {
		boolean refCountIsZero = false;
		synchronized(this) {
		mReferenceCount--;
		if (mReferenceCount == 0) {
		onAllReferencesReleasedFromContainer();
		refCountIsZero = --mReferenceCount == 0;
		}
		if (refCountIsZero) {
		onAllReferencesReleasedFromContainer();
		}
		}