Merge change 8571
* changes:
Don't leave restore data lying around after the operation
diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java
index 618529b..e74b37b 100644
--- a/services/java/com/android/server/BackupManagerService.java
+++ b/services/java/com/android/server/BackupManagerService.java
@@ -1281,6 +1281,8 @@
// again in this case before propagating the exception
Log.e(TAG, "Error restoring data for " + packageName, e);
clearApplicationDataSynchronous(packageName);
+ } finally {
+ backupDataName.delete();
}
}
}