diff options
| author | 2024-11-27 13:48:24 +0000 | |
|---|---|---|
| committer | 2024-11-27 13:48:24 +0000 | |
| commit | 2d796a170f247787a795325eb0b29178d33e0368 (patch) | |
| tree | 6efe70f51b9427a03108f286b5f969c37ca5818d | |
| parent | 6792e492a40d1eb3a08b6975015d71893d28a63c (diff) | |
| parent | a25cf4f985c323ab28b4a93d4dfc48f27432e237 (diff) | |
Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: a25cf4f985
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3376859
Change-Id: I07f4900fd794187a6a3491936dcaa0fe14a278e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | services/core/Android.bp | 1 | ||||
| -rw-r--r-- | services/core/java/com/android/server/am/SettingsToPropertiesMapper.java | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index 33964c1df85d..ff61a6342ac0 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -236,7 +236,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 f1965f692734..c6d6820d66e5 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -40,7 +40,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; @@ -443,8 +442,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)); |