From 89ccdb6bb16d995adcf4efdd03d90e988203ea81 Mon Sep 17 00:00:00 2001
From: Varun Shah <varunshah@google.com>
Date: Thu, 22 Sep 2022 13:19:41 -0700
Subject: [PATCH] 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
---
 .../java/com/android/server/content/SyncStorageEngine.java    | 4 ++--
 1 file 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 2c6257f7cba66..5c679b8736030 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);
         }
     }