Merge remote-tracking branch 'origin/lineage-21.0' into v1-u (c19f5bc1) · Commits · e / os / android_frameworks_base

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

+9 −7

Original line number	Diff line number	Diff line
		@@ -145,6 +145,7 @@ final class ResilientAtomicFile implements Closeable {
		finalizeOutStream(reserveOutStream);
		}

		if (PackageManagerServiceUtils.isApkVerityEnabled()) {
		// Protect both main and reserve using fs-verity.
		try (ParcelFileDescriptor mainPfd = ParcelFileDescriptor.dup(mainInStream.getFD());
		ParcelFileDescriptor copyPfd = ParcelFileDescriptor.dup(reserveInStream.getFD())) {
		@@ -153,6 +154,7 @@ final class ResilientAtomicFile implements Closeable {
		} catch (IOException e) {
		Slog.e(LOG_TAG, "Failed to verity-protect " + mDebugName, e);
		}
		}
		} catch (IOException e) {
		Slog.e(LOG_TAG, "Failed to write reserve copy " + mDebugName + ": " + mReserveCopy, e);
		}