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

Commit 2d796a17 authored by Dennis Shen's avatar Dennis Shen Committed by Automerger Merge Worker
Browse files

Merge "Deprecate cc_binary aconfigd and the controlling flag" into main am: a25cf4f9 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3376859



Change-Id: I07f4900fd794187a6a3491936dcaa0fe14a278e6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6792e492 a25cf4f9

services/core/Android.bp

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

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

+1 −3
Original line number Diff line number Diff line
@@ -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));