Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed001ec2 authored by Alex Buynytskyy's avatar Alex Buynytskyy Committed by Automerger Merge Worker
Browse files

Merge "Avoid infinite loop in case system_server does not have delete access."... 

Merge "Avoid infinite loop in case system_server does not have delete access." into udc-dev am: 1cb2fb89 am: 522aee36

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23507866



Change-Id: Ieee959c4a164fd574231a5d8cdc73b7c81c48953
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b38d85a0 522aee36

services/core/java/com/android/server/pm/ResilientAtomicFile.java

+3 −1
Original line number Diff line number Diff line
@@ -230,7 +230,9 @@ final class ResilientAtomicFile implements Closeable { 
                            + Log.getStackTraceString(e));

        }



        mCurrentFile.delete();

        if (!mCurrentFile.delete()) {

            throw new IllegalStateException("Failed to remove " + mCurrentFile);

        }

        mCurrentFile = null;

    }