diff options
| author | 2024-12-30 12:26:05 -0800 | |
|---|---|---|
| committer | 2024-12-31 06:11:37 -0800 | |
| commit | 083435bc3b4af4d8e91a79fc39e41ed96d7176ba (patch) | |
| tree | 28a5f33c815adbe212f06440297e35e293989198 | |
| parent | 5a1c8f3292b8e4df6fbd73c11f7b5f11dffdf725 (diff) | |
| parent | 3bf2a51974f5b8f1e7ee2de5dca340df338ac70c (diff) | |
[conflict] Merge "PackageWatchdog: fix the double close issue." into main am: 39ef472712 am: 3bf2a51974
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3412243
Change-Id: If90d5eb46dc6e57bad1cbc6a3c3637c5af272b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Flag: EXEMPT cherry pick
Test: TH
Bug: none
| -rw-r--r-- | packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java | 2 | ||||
| -rw-r--r-- | packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java b/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java index ef46906f9cf4..e4f07f9fc213 100644 --- a/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java +++ b/packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java @@ -1364,8 +1364,6 @@ public class PackageWatchdog { Slog.w(TAG, "Failed to save monitored packages, restoring backup", e); mPolicyFile.failWrite(stream); return false; - } finally { - IoUtils.closeQuietly(stream); } } } diff --git a/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java b/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java index 4a00ed3d1d46..5297c8b61aad 100644 --- a/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java +++ b/packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java @@ -1372,8 +1372,6 @@ public class PackageWatchdog { Slog.w(TAG, "Failed to save monitored packages, restoring backup", e); mPolicyFile.failWrite(stream); return false; - } finally { - IoUtils.closeQuietly(stream); } } } |