Merge "Thread-safe pipe teardown during restore operations" into nyc-mr1-dev (4595bc7f) · Commits · e / os / android_frameworks_base

services/backup/java/com/android/server/backup/BackupManagerService.java

+14 −9

Original line number	Diff line number	Diff line
		@@ -5707,6 +5707,10 @@ public class BackupManagerService {
		}

		void tearDownPipes() {
		// Teardown might arise from the inline restore processing or from the asynchronous
		// timeout mechanism, and these might race. Make sure we don't try to close and
		// null out the pipes twice.
		synchronized (this) {
		if (mPipes != null) {
		try {
		mPipes[0].close();
		@@ -5719,6 +5723,7 @@ public class BackupManagerService {
		mPipes = null;
		}
		}
		}

		void tearDownAgent(ApplicationInfo app) {
		if (mAgent != null) {