From e30e7a93f49bebcd1f9cfa58cd349830d450891f Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Sat, 18 Feb 2023 22:06:25 +0800 Subject: [PATCH] Skip reading config file that does not exist By default there is no such file. This avoids printing exception log on every boot. Especially it prints out thousands of callstack when running unit tests. Bug: 159102753 Test: LetterboxConfigurationPersisterTest Change-Id: I64a62c4aa66ac045aa4b1ddf1ad2e51d7bf4ca5b (cherry picked from commit 15942b75e960fdca8bc348428ce55affae5aa9d1) Merged-In: I64a62c4aa66ac045aa4b1ddf1ad2e51d7bf4ca5b --- .../android/server/wm/LetterboxConfigurationPersister.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/services/core/java/com/android/server/wm/LetterboxConfigurationPersister.java b/services/core/java/com/android/server/wm/LetterboxConfigurationPersister.java index 4a99db5947550..3b10debaa7531 100644 --- a/services/core/java/com/android/server/wm/LetterboxConfigurationPersister.java +++ b/services/core/java/com/android/server/wm/LetterboxConfigurationPersister.java @@ -216,6 +216,10 @@ class LetterboxConfigurationPersister { } private void readCurrentConfiguration() { + if (!mConfigurationFile.exists()) { + useDefaultValue(); + return; + } FileInputStream fis = null; try { fis = mConfigurationFile.openRead();