From d712ae44b1dea5f58b094a79a8d2d1ad7155b326 Mon Sep 17 00:00:00 2001
From: Alex Buynytskyy <alexbuy@google.com>
Date: Fri, 24 Feb 2023 06:18:12 +0000
Subject: [PATCH] Fix for: leaking pfd.

Bug: 253568736
Test: atest SettingsTest
Change-Id: I7426c97310f66b4bcf7a434deb22aca445ff08f3
---
 .../core/java/com/android/server/security/FileIntegrity.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/core/java/com/android/server/security/FileIntegrity.java b/services/core/java/com/android/server/security/FileIntegrity.java
index 8047638f52889..b8f187e0ee3af 100644
--- a/services/core/java/com/android/server/security/FileIntegrity.java
+++ b/services/core/java/com/android/server/security/FileIntegrity.java
@@ -46,8 +46,9 @@ public final class FileIntegrity {
      */
     @SystemApi(client = SystemApi.Client.SYSTEM_SERVER)
     public static void setUpFsVerity(@NonNull File file) throws IOException {
-        ParcelFileDescriptor pfd = ParcelFileDescriptor.open(file, MODE_READ_ONLY);
-        setUpFsVerity(pfd);
+        try (ParcelFileDescriptor pfd = ParcelFileDescriptor.open(file, MODE_READ_ONLY)) {
+            setUpFsVerity(pfd);
+        }
     }
 
     /**