Merge change 25626 into eclair

* changes:
  Check if rename of current settings file was successful before persisting new changes to settings.

services/java/com/android/server/PackageManagerService.java

@@ -6376,7 +6376,10 @@ class PackageManagerService extends IPackageManager.Stub {
                 if (mBackupSettingsFilename.exists()) {
                     mBackupSettingsFilename.delete();
                 }
-                mSettingsFilename.renameTo(mBackupSettingsFilename);
+                if (!mSettingsFilename.renameTo(mBackupSettingsFilename)) {
+                    Log.w(TAG, "Unable to backup package manager settings, current changes will be lost at reboot");
+                    return;
+                }
             }
 
             mPastSignatures.clear();