Merge "Don't delete the new file in openRead()." into rvc-dev

2020-05-20 07:39:29 +00:00
parent 3d04afb408 25adf3c471
commit c74a76863b
1 changed files with 2 additions and 5 deletions
--- a/core/java/android/util/AtomicFile.java
+++ b/core/java/android/util/AtomicFile.java
@@ -227,11 +227,8 @@ public class AtomicFile {
            }
        }

-        if (mNewName.exists()) {
-            if (!mNewName.delete()) {
-                Log.e(LOG_TAG, "Failed to delete outdated new file " + mNewName);
-            }
-        }
+        // Don't delete mNewName here - it was okay to call openRead() between startWrite() and
+        // finishWrite(), and we have to keep supporting it.
        return new FileInputStream(mBaseName);
    }