commit 143c57c93445e9d60bcb74f7c940dd4d83e6938d
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Feb 13 10:24:52 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 13 10:24:52 2025 -0800
tree 9ff6576413368e264a0dc082aad1486eb3e6c3dc
parent 5e8299f67ec91215b97135620e5587c68890b06b
parent 3f4ee6c4b5482b895b06f5eb084f933941f5c76c

Merge "Add catching of IllegalArgumentException, which gets thrown when there is a malformed Unicode escape character sequence" into main

networksecurity/service/src/com/android/server/net/ct/DataStore.java

diff --git a/networksecurity/service/src/com/android/server/net/ct/DataStore.java b/networksecurity/service/src/com/android/server/net/ct/DataStore.java
index 8180316..1f99efa 100644
--- a/networksecurity/service/src/com/android/server/net/ct/DataStore.java
+++ b/networksecurity/service/src/com/android/server/net/ct/DataStore.java
@@ -44,8 +44,9 @@
         }
         try (InputStream in = new FileInputStream(mPropertyFile)) {
             load(in);
-        } catch (IOException e) {
+        } catch (IOException | IllegalArgumentException e) {
             Log.e(TAG, "Error loading property store", e);
+            delete();
         }
     }