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

Commit 083435bc authored by Harshit Mahajan's avatar Harshit Mahajan Committed by Alexei Nicoara
Browse files

[conflict] Merge "PackageWatchdog: fix the double close issue." into main am:... 

[conflict] Merge "PackageWatchdog: fix the double close issue." into main am: 39ef4727 am: 3bf2a519

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



Change-Id: If90d5eb46dc6e57bad1cbc6a3c3637c5af272b91
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Flag: EXEMPT cherry pick
Test: TH
Bug: none
parents 5a1c8f32 3bf2a519

packages/CrashRecovery/services/module/java/com/android/server/PackageWatchdog.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }

packages/CrashRecovery/services/platform/java/com/android/server/PackageWatchdog.java

+0 −2
Original line number Diff line number Diff line
@@ -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);

            }

        }

    }