Merge "Don't delete the new file in openRead()." into rvc-dev am: c74a76863b am: 990a07462b am: 441824370e

Change-Id: I736c8a45fef1d1d9d802c7f573bf156e9364a76e

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);
     }