summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Varun Shah <varunshah@google.com> 2022-09-22 13:19:41 -0700
committer Varun Shah <varunshah@google.com> 2022-09-22 13:19:41 -0700
commit89ccdb6bb16d995adcf4efdd03d90e988203ea81 (patch)
tree1ef0bba9ec7844d683340223e648e1451e050c13
parent7144d64e3a1b858f93f895b7da1e9ad7adf985a3 (diff)
Ensure RuntimeExceptions are also caught properly.
While reading the new proto stats, SyncStorageEngine can crash if a RuntimeException is thrown - update the catch logic. Bug: 242320010 Test: atest SyncStorageEngineTest Change-Id: I1bf0ec8bae62f3f8840ad3015d71179729e407d1
-rw-r--r--services/core/java/com/android/server/content/SyncStorageEngine.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index 2c6257f7cba6..5c679b873603 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -2083,7 +2083,7 @@ public class SyncStorageEngine {
try (FileInputStream in = mStatusFile.openRead()) {
readStatusInfoLocked(in);
}
- } catch (IOException e) {
+ } catch (Exception e) {
Slog.e(TAG, "Unable to read status info file.", e);
}
}
@@ -2483,7 +2483,7 @@ public class SyncStorageEngine {
try (FileInputStream in = mStatisticsFile.openRead()) {
readDayStatsLocked(in);
}
- } catch (IOException e) {
+ } catch (Exception e) {
Slog.e(TAG, "Unable to read day stats file.", e);
}
}