Merge "CMFM: Fix sync object" into cm-10.1 (6e8dd09a) · Commits · e / os / android_packages_apps_CMFileManager

src/com/cyanogenmod/filemanager/commands/shell/AsyncResultProgram.java

+6 −10

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ public abstract class AsyncResultProgram
		* @hide
		*/
		final List<Byte> mPartialDataType;
		private final Object mSync = new Object();
		final Object mSync = new Object();
		/**
		* @hide
		*/
		@@ -106,7 +106,7 @@ public abstract class AsyncResultProgram
		* @hide
		*/
		public final void onRequestStartParsePartialResult() {
		this.mWorkerThread = new AsyncResultProgramThread(this.mSync);
		this.mWorkerThread = new AsyncResultProgramThread();
		this.mWorkerThread.start();

		//Notify start to command class
		@@ -132,7 +132,7 @@ public abstract class AsyncResultProgram
		}
		synchronized (this.mTerminateSync) {
		try {
		this.mSync.wait();
		this.mTerminateSync.wait();
		} catch (Exception e) {
		/NON BLOCK/
		}
		@@ -353,16 +353,12 @@ public abstract class AsyncResultProgram
		*/
		private class AsyncResultProgramThread extends Thread {
		boolean mAlive = true;
		private final Object mSyncObj;

		/**
		* Constructor of <code>AsyncResultProgramThread</code>.
		*
		* @param sync The synchronized object
		*/
		AsyncResultProgramThread(Object sync) {
		AsyncResultProgramThread() {
		super();
		this.mSyncObj = sync;
		}

		/**
		@@ -373,8 +369,8 @@ public abstract class AsyncResultProgram
		try {
		this.mAlive = true;
		while (this.mAlive) {
		synchronized (this.mSyncObj) {
		this.mSyncObj.wait();
		synchronized (AsyncResultProgram.this.mSync) {
		AsyncResultProgram.this.mSync.wait();
		while (AsyncResultProgram.this.mPartialData.size() > 0) {
		if (!this.mAlive) {
		return;