diff --git a/services/core/java/com/android/server/net/watchlist/WatchlistConfig.java b/services/core/java/com/android/server/net/watchlist/WatchlistConfig.java index 2714d5e5f605d..d793842093cca 100644 --- a/services/core/java/com/android/server/net/watchlist/WatchlistConfig.java +++ b/services/core/java/com/android/server/net/watchlist/WatchlistConfig.java @@ -107,6 +107,10 @@ class WatchlistConfig { * Reload watchlist by reading config file. */ public void reloadConfig() { + if (!mXmlFile.exists()) { + // No config file + return; + } try (FileInputStream stream = new FileInputStream(mXmlFile)){ final List crc32DomainList = new ArrayList<>(); final List sha256DomainList = new ArrayList<>(); diff --git a/services/core/java/com/android/server/net/watchlist/WatchlistSettings.java b/services/core/java/com/android/server/net/watchlist/WatchlistSettings.java index f5ba889e8cf42..e20a510d888f3 100644 --- a/services/core/java/com/android/server/net/watchlist/WatchlistSettings.java +++ b/services/core/java/com/android/server/net/watchlist/WatchlistSettings.java @@ -87,6 +87,10 @@ class WatchlistSettings { } public void reloadSettings() { + if (!mXmlFile.exists()) { + // No settings config + return; + } try (FileInputStream stream = mXmlFile.openRead()){ XmlPullParser parser = Xml.newPullParser(); parser.setInput(stream, StandardCharsets.UTF_8.name()); @@ -97,7 +101,7 @@ class WatchlistSettings { mPrivacySecretKey = parseSecretKey(parser); } } - Log.i(TAG, "Reload watchlist settings done"); + Slog.i(TAG, "Reload watchlist settings done"); } catch (IllegalStateException | NullPointerException | NumberFormatException | XmlPullParserException | IOException | IndexOutOfBoundsException e) { Slog.e(TAG, "Failed parsing xml", e);