From c0f32de2f6e8db37a9264dd46d1098c30bbba23a Mon Sep 17 00:00:00 2001 From: Dennis Shen Date: Tue, 26 Nov 2024 00:41:38 +0000 Subject: Deprecate cc_binary aconfigd and the controlling flag cc_binary aconfigd is replaced with rust_binary aconfigd-system. The replacement is flag guarded and is already in TF full for more than a week. Thus delete the flag and deprecate old cc_binary aconfigd. Test: m Change-Id: Ie9e7132d2befbd4a907b7aa3b4e3a0de8b36775d Merged-In: Ie9e7132d2befbd4a907b7aa3b4e3a0de8b36775d --- services/core/Android.bp | 1 - .../core/java/com/android/server/am/SettingsToPropertiesMapper.java | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/services/core/Android.bp b/services/core/Android.bp index f08c876e3104..349f3ee2b9f0 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -233,7 +233,6 @@ java_library_static { "core_os_flags_lib", "connectivity_flags_lib", "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 90f92b079220..f79256d6147b 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -39,7 +39,6 @@ import android.aconfigd.Aconfigd.StorageRequestMessages; import android.aconfigd.Aconfigd.StorageReturnMessage; import android.aconfigd.Aconfigd.StorageReturnMessages; import static com.android.aconfig_new_storage.Flags.enableAconfigStorageDaemon; -import static com.android.aconfig.flags.Flags.enableSystemAconfigdRust; import java.io.DataInputStream; import java.io.DataOutputStream; @@ -392,8 +391,7 @@ public class SettingsToPropertiesMapper { static ProtoInputStream sendAconfigdRequests(ProtoOutputStream requests) { // connect to aconfigd socket LocalSocket client = new LocalSocket(); - String socketName = enableSystemAconfigdRust() - ? "aconfigd_system" : "aconfigd"; + String socketName = "aconfigd_system"; try { client.connect(new LocalSocketAddress( socketName, LocalSocketAddress.Namespace.RESERVED)); -- cgit v1.2.3-59-g8ed1b