Commit f8c50163 authored Jun 03, 2023 by Alex Buynytskyy Committed by Automerger Merge Worker Jun 03, 2023

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

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

Change-Id: Ic164cd81331468ade9fb84e343a84e8910a91ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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