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

            }

        }

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

    }