am 7a51b14d: am 094e3e0b: Merge change Icb89d482 into eclair

Merge commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658' * commit '7a51b14d9f7f8c48c74ed1787bed3ef83aae6658': Check if rename of backed up file fails before persisting new changes.
2009-10-01 12:23:14 -07:00
parent e6e8dfac35 7a51b14d9f
commit 4b7b70dae4
5 changed files with 31 additions and 9 deletions
--- a/core/java/android/app/ApplicationContext.java
+++ b/core/java/android/app/ApplicationContext.java
@@ -2760,6 +2760,7 @@ class ApplicationContext extends Context {
            if (mFile.exists()) {
                if (!mFile.renameTo(mBackupFile)) {
                    Log.e(TAG, "Couldn't rename file " + mFile + " to backup file " + mBackupFile);
+                    return false;
                }
            }