commit c1544d4df508cc634616aff02358414546c4f56d
author Varun Shah <varunshah@google.com> Tue Feb 28 23:17:18 2023 +0000
committer Varun Shah <varunshah@google.com> Tue Feb 28 23:17:37 2023 +0000
tree 0ad1108841ce59b2c24ed2838f3c66fce8fe092a
parent dee3426d1d3f1ea67a32408a7f09e7da4768f1b9

Ensure RuntimeExceptions are also caught properly.

While reading the proto stats from disk, AppExitInfoTracker
can crash if a RuntimeException is thrown - update the catch logic.

Bug: 268301239
Change-Id: I76c86d844595674ef2171c13508adb710b151dae
Test: atest ApplicationExitInfoTest

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

diff --git a/services/core/java/com/android/server/am/AppExitInfoTracker.java b/services/core/java/com/android/server/am/AppExitInfoTracker.java
index 32d2071..1ba3266 100644
--- a/services/core/java/com/android/server/am/AppExitInfoTracker.java
+++ b/services/core/java/com/android/server/am/AppExitInfoTracker.java
@@ -674,7 +674,7 @@
                         break;
                 }
             }
-        } catch (IOException | IllegalArgumentException | WireTypeMismatchException e) {
+        } catch (Exception e) {
             Slog.w(TAG, "Error in loading historical app exit info from persistent storage: " + e);
         } finally {
             if (fin != null) {