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

Commit 3750ea91 authored by Yisroel Forta's avatar Yisroel Forta
Browse files

Start/Exit info catch exception on write fail 

When write fails due to ENOSPC, ProtoOutputStream may throw a
RuntimeException, catch it so it doesn't crash system server.

Last write time is already updated so the write will be attempted
again at the next scheduled time (no sooner than 30 minutes).
Additional logic to determine whether subsequent writes should
not be attempted is warranted and will be investigated separately.

Bug: 341047085
Test: presubmit
Flag: EXEMPT - simple bugfix
Change-Id: Ib5f31c7e4fdb90d9f563145d4f66ff8cc161fe45
parent d5f3da8f

services/core/java/com/android/server/am/AppExitInfoTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ public final class AppExitInfoTracker { 
            }

            proto.flush();

            af.finishWrite(out);

        } catch (IOException e) {

        } catch (IOException | RuntimeException e) {

            Slog.w(TAG, "Unable to write historical app exit info into persistent storage: " + e);

            af.failWrite(out);

        }

services/core/java/com/android/server/am/AppStartInfoTracker.java

+1 −1
Original line number Diff line number Diff line
@@ -1046,7 +1046,7 @@ public final class AppStartInfoTracker { 
            } else {

                af.failWrite(out);

            }

        } catch (IOException e) {

        } catch (IOException | RuntimeException e) {

            Slog.w(TAG, "Unable to write historical app start info into persistent storage: " + e);

            af.failWrite(out);

        }