From f7a41c8de71e5500680ebb5e1f60a33ac3646dd6 Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Mon, 9 Dec 2024 14:24:46 +0000 Subject: remove system_ext aconfig_flags.pb look up system_ext and system are treated as the same container now, we no longer producing system_ext aconfig_flags.pb, resulting unwanted log spam in logcat. Thus removing it here. Test: m Change-Id: Ia34700c37df0f00bbaa85030742e4b7b70595121 --- .../src/com/android/providers/settings/DeviceConfigService.java | 1 - .../src/com/android/providers/settings/SettingsState.java | 1 - 2 files changed, 2 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java index 2227943c0cc0..9140cefe4574 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DeviceConfigService.java @@ -66,7 +66,6 @@ import java.util.Map; public final class DeviceConfigService extends Binder { private static final List sAconfigTextProtoFilesOnDevice = List.of( "/system/etc/aconfig_flags.pb", - "/system_ext/etc/aconfig_flags.pb", "/product/etc/aconfig_flags.pb", "/vendor/etc/aconfig_flags.pb"); diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java index 68b66dfa2657..3b4988e1f0e6 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsState.java @@ -171,7 +171,6 @@ final class SettingsState { private static final List sAconfigTextProtoFilesOnDevice = List.of( "/system/etc/aconfig_flags.pb", - "/system_ext/etc/aconfig_flags.pb", "/product/etc/aconfig_flags.pb", "/vendor/etc/aconfig_flags.pb"); -- cgit v1.2.3-59-g8ed1b