Merge "Remove closeTransactionSync since it's no longer used." (ace4f6a0) · Commits · e / os / android_frameworks_base

core/java/android/view/SurfaceControl.java

+11 −21

Original line number	Original line	Diff line number	Diff line
	@@ -978,17 +978,6 @@ public final class SurfaceControl implements Parcelable {
	}		}
	}		}

	private static void closeTransaction(boolean sync) {
	synchronized(SurfaceControl.class) {
	if (sTransactionNestCount == 0) {
	Log.e(TAG, "Call to SurfaceControl.closeTransaction without matching openTransaction");
	} else if (--sTransactionNestCount > 0) {
	return;
	}
	sGlobalTransaction.apply(sync);
	}
	}

	/**		/**
	* Merge the supplied transaction in to the deprecated "global" transaction.		* Merge the supplied transaction in to the deprecated "global" transaction.
	* This clears the supplied transaction in an identical fashion to {@link Transaction#merge}.		* This clears the supplied transaction in an identical fashion to {@link Transaction#merge}.
	@@ -1008,14 +997,15 @@ public final class SurfaceControl implements Parcelable {
	*/		*/
	@UnsupportedAppUsage		@UnsupportedAppUsage
	public static void closeTransaction() {		public static void closeTransaction() {
	closeTransaction(false);		synchronized(SurfaceControl.class) {
			if (sTransactionNestCount == 0) {
			Log.e(TAG,
			"Call to SurfaceControl.closeTransaction without matching openTransaction");
			} else if (--sTransactionNestCount > 0) {
			return;
			}
			sGlobalTransaction.apply();
	}		}

	/**
	* @hide
	*/
	public static void closeTransactionSync() {
	closeTransaction(true);
	}		}

	/**		/**