Merge change 6132 into donut

* changes:
  If we can't get the restore set's metadata, don't continue

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

@@ -943,6 +943,15 @@ class BackupManagerService extends IBackupManager.Stub {
                         mPackageManager, agentPackages);
                 processOneRestore(omPackage, 0, IBackupAgent.Stub.asInterface(pmAgent.onBind()));
 
+                // Verify that the backup set includes metadata.  If not, we can't do
+                // signature/version verification etc, so we simply do not proceed with
+                // the restore operation.
+                Metadata pmMeta = pmAgent.getRestoredMetadata(packageName);
+                if (pmMeta == null) {
+                    Log.i(TAG, "No restore metadata available, so not restoring settings");
+                    return;
+                }
+
                 int count = 0;
                 for (;;) {
                     packageName = mTransport.nextRestorePackage();