From 3ed30b1cd947173f114b48db08d5c9961c132c73 Mon Sep 17 00:00:00 2001
From: pbzin <pbzinwindows@gmail.com>
Date: Fri, 28 Aug 2026 22:03:50 -0300
Subject: [PATCH] crdroid: Apply DeviceConfig defaults before consumers start

---
 .../server/crdroid/CustomDeviceConfigService.java      |  1 +
 services/java/com/android/server/SystemServer.java     | 10 ++++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java b/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java
index 8d8d18f188afe..7cad31b985594 100644
--- a/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java
+++ b/services/core/java/com/android/server/crdroid/CustomDeviceConfigService.java
@@ -23,6 +23,7 @@ public CustomDeviceConfigService(Context context) {
 
     @Override
     public void onStart() {
+        DeviceConfigUtils.setDefaultProperties(null, null);
     }
 
     @Override
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index c31e6f50947cd..479e4f20771e7 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -2183,6 +2183,12 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
             }
             t.traceEnd();
 
+            // CustomDeviceConfigService must run before services that read boot-time
+            // DeviceConfig flags.
+            t.traceBegin("StartCustomDeviceConfigService");
+            mSystemServiceManager.startService(CustomDeviceConfigService.class);
+            t.traceEnd();
+
             t.traceBegin("StartNetworkManagementService");
             try {
                 networkManagement = NetworkManagementService.create(context);
@@ -2917,10 +2923,6 @@ private void startOtherServices(@NonNull TimingsTraceAndSlog t) {
                 t.traceEnd();
             }
 
-            // CustomDeviceConfigService
-            t.traceBegin("StartCustomDeviceConfigService");
-            mSystemServiceManager.startService(CustomDeviceConfigService.class);
-            t.traceEnd();
         }
 
         t.traceBegin("StartMediaProjectionManager");