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

Commit 50ef447e authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Read from aconfigd_socket when flag flipped" into main

parents 9e493bed f1f0ff37

services/core/Android.bp

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

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

+5 −2
Original line number Diff line number Diff line
@@ -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();

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