diff options
| -rw-r--r-- | services/core/Android.bp | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/SettingsToPropertiesMapper.java | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index aea16b08df49..7f482ac79989 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -238,7 +238,6 @@ java_library_static { "connectivity_flags_lib", "device_config_service_flags_java", "dreams_flags_lib", - "aconfig_flags_java", "aconfig_new_storage_flags_lib", "powerstats_flags_lib", "locksettings_flags_lib", diff --git a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java index ef5296eef492..5c4f0fd2cc9d 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -42,7 +42,6 @@ import android.aconfigd.Aconfigd.StorageReturnMessages; import static com.android.aconfig_new_storage.Flags.enableAconfigStorageDaemon; import static com.android.aconfig_new_storage.Flags.supportImmediateLocalOverrides; import static com.android.aconfig_new_storage.Flags.supportClearLocalOverridesImmediately; -import static com.android.aconfig.flags.Flags.enableSystemAconfigdRust; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -458,9 +457,8 @@ public class SettingsToPropertiesMapper { static ProtoInputStream sendAconfigdRequests(ProtoOutputStream requests) { // connect to aconfigd socket LocalSocket client = new LocalSocket(); - String socketName = enableSystemAconfigdRust() - ? "aconfigd_system" : "aconfigd"; - try{ + String socketName = "aconfigd_system"; + try { client.connect(new LocalSocketAddress( socketName, LocalSocketAddress.Namespace.RESERVED)); Slog.d(TAG, "connected to aconfigd socket"); |