Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7f09d91 authored by Ted Bauer's avatar Ted Bauer Committed by Android (Google) Code Review
Browse files

Merge "Read from aconfigd_socket when flag flipped" into main

parents 877d6c17 9e48e273

services/core/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ 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",

services/core/java/com/android/server/am/SettingsToPropertiesMapper.java

+4 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 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;
@@ -456,9 +457,11 @@ public class SettingsToPropertiesMapper { 
    static ProtoInputStream sendAconfigdRequests(ProtoOutputStream requests) {

        // connect to aconfigd socket

        LocalSocket client = new LocalSocket();

        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);