From c8311fecc93c631f088aa25310ffe1cc5cb40796 Mon Sep 17 00:00:00 2001 From: Paul Lawrence Date: Fri, 25 Oct 2024 21:26:13 +0000 Subject: Revert^2 "Disable trade-in mode service on phones, TV and auto" This reverts commit 51f7b73ecefa34beb1215551eb99f3bbfe0f2a67. Reason for revert: Regression fixed in ag/30084178 Test: Build, boot cf_x86_64_auto-trunk_staging-userdebug Find devicediagnostics.BootCompleteReceiver in logcat Make sure no exceptions Bug: 375454594 Flag: com.android.tradeinmode.flags.enable_trade_in_mode Change-Id: Ib55794e3e29a69f418b62f41a5c31d6d5c83ce5f --- services/java/com/android/server/SystemServer.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 6baab25d0dce..ed56382450e9 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1399,10 +1399,6 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(BatteryService.class); t.traceEnd(); - t.traceBegin("StartTradeInModeService"); - mSystemServiceManager.startService(TradeInModeService.class); - t.traceEnd(); - // Tracks application usage stats. t.traceBegin("StartUsageService"); mSystemServiceManager.startService(UsageStatsService.class); @@ -1772,6 +1768,13 @@ public final class SystemServer implements Dumpable { mSystemServiceManager.startService(AdvancedProtectionService.Lifecycle.class); t.traceEnd(); } + + if (!isWatch && !isTv && !isAutomotive) { + t.traceBegin("StartTradeInModeService"); + mSystemServiceManager.startService(TradeInModeService.class); + t.traceEnd(); + } + } catch (Throwable e) { Slog.e("System", "******************************************"); Slog.e("System", "************ Failure starting core service"); -- cgit v1.2.3-59-g8ed1b