Merge "Gracefully handle "needs init" transport errors at finish"

Author: Christopher Tate

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

@@ -1966,6 +1966,9 @@ void finalizeBackup() {
             synchronized (mQueueLock) {
                 mBackupRunning = false;
                 if (mStatus == BackupConstants.TRANSPORT_NOT_INITIALIZED) {
+                    // Make sure we back up everything and perform the one-time init
+                    clearMetadata();
+                    if (DEBUG) Slog.d(TAG, "Server requires init; rerunning");
                     backupNow();
                 }
             }
@@ -1975,6 +1978,12 @@ void finalizeBackup() {
             mWakelock.release();
         }
 
+        // Remove the PM metadata state. This will generate an init on the next pass.
+        void clearMetadata() {
+            final File pmState = new File(mStateDir, PACKAGE_MANAGER_SENTINEL);
+            if (pmState.exists()) pmState.delete();
+        }
+
         // Invoke an agent's doBackup() and start a timeout message spinning on the main
         // handler in case it doesn't get back to us.
         int invokeAgentForBackup(String packageName, IBackupAgent agent,