diff options
| author | 2024-11-08 21:43:18 +0000 | |
|---|---|---|
| committer | 2024-11-08 21:43:18 +0000 | |
| commit | 5d0fbf2372a72074c25e18f730f0aafbf0df1aed (patch) | |
| tree | df9ef308040f5b447fce04a593694b177c2fd74b | |
| parent | b07933ee16c96079debb742b233b93cfcdeb9b3d (diff) | |
| parent | 50ef447e31b0b5b968130116645c6f7b89eb3ca2 (diff) | |
Merge "Read from aconfigd_socket when flag flipped" into main am: 50ef447e31
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3341742
Change-Id: Ic0e3c2c00c4c977c3749402eba225bfa5bb08c84
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 | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/services/core/Android.bp b/services/core/Android.bp index 349f3ee2b9f0..f08c876e3104 100644 --- a/services/core/Android.bp +++ b/services/core/Android.bp @@ -233,6 +233,7 @@ 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 5c3640fa375d..4ec2a04551e9 100644 --- a/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java +++ b/services/core/java/com/android/server/am/SettingsToPropertiesMapper.java @@ -39,6 +39,7 @@ 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; @@ -391,9 +392,11 @@ public class SettingsToPropertiesMapper { static ProtoInputStream sendAconfigdRequests(ProtoOutputStream requests) { // connect to aconfigd socket LocalSocket client = new LocalSocket(); - try{ + String socketName = enableSystemAconfigdRust() + ? "aconfigd_system" : "aconfigd"; + try { client.connect(new LocalSocketAddress( - "aconfigd", LocalSocketAddress.Namespace.RESERVED)); + socketName, LocalSocketAddress.Namespace.RESERVED)); Slog.d(TAG, "connected to aconfigd socket"); } catch (IOException ioe) { logErr("failed to connect to aconfigd socket", ioe); |