Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Thread-safe pipe teardown during restore operations" into nyc-mr1-dev

Browse Source
This commit is contained in:
Chris Tate
2016-07-15 01:38:02 +00:00
committed by Android (Google) Code Review
parent b30e1f75d1 ad869cc908
commit 4595bc7f12
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -5707,16 +5707,21 @@ public class BackupManagerService {
}
void tearDownPipes() {
if (mPipes != null) {
try {
mPipes[0].close();
mPipes[0] = null;
mPipes[1].close();
mPipes[1] = null;
} catch (IOException e) {
Slog.w(TAG, "Couldn't close agent pipes", e);
// 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();
mPipes[0] = null;
mPipes[1].close();
mPipes[1] = null;
} catch (IOException e) {
Slog.w(TAG, "Couldn't close agent pipes", e);
}
mPipes = null;
}
mPipes = null;
}
}