Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21727b21 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "SettingsProvider: aconfig: do not error on missing flag files"...

Merge "Merge "SettingsProvider: aconfig: do not error on missing flag files" into main am: 373d1944 am: 65476a40" into main
parents 81676947 aa494d4b
Loading
Loading
Loading
Loading
+10 −5
Original line number Diff line number Diff line
@@ -456,12 +456,17 @@ public class SettingsState {
    @GuardedBy("mLock")
    private void loadAconfigDefaultValuesLocked(List<String> filePaths) {
        for (String fileName : filePaths) {
            File f = new File(fileName);
            if (f.isFile() && f.canRead()) {
                try (FileInputStream inputStream = new FileInputStream(fileName)) {
                    loadAconfigDefaultValues(
                            inputStream.readAllBytes(), mNamespaceDefaults, mAconfigDefaultFlags);
                } catch (IOException e) {
                    Slog.e(LOG_TAG, "failed to read protobuf", e);
                }
            } else {
                Slog.d(LOG_TAG, "No protobuf file at " + fileName);
            }
        }
    }