Add catching of IllegalArgumentException, which gets thrown when there is a malformed Unicode escape character sequence
System crashes are occurring for partners (b/396308673) due to the DataStore failing to load. While we investigate the underlying cause, add IllegalArgumentExceptions to the catch clause to prevent the fatal exception from being thrown.
Change-Id: I99e72af60064e2f0a5eed69c4f82b6cc69ee5f66
Fixes: 396308673
Flag: com.android.net.ct.flags.certificate_transparency_service
Test: atest NetworkSecurityUnitTests
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();
}
}