From 51f7b73ecefa34beb1215551eb99f3bbfe0f2a67 Mon Sep 17 00:00:00 2001 From: "Liana Kazanova (xWF)" Date: Fri, 25 Oct 2024 18:04:59 +0000 Subject: Revert "Disable trade-in mode service on phones, TV and auto" This reverts commit b49c77249ce97f16a17cd92510920222ede904f4. Reason for revert: DroidMonitor: Reverting due to http://b/375535813. Change-Id: Ic5bb28aa10cf10199ea54519ef22f24da47b7fcb --- services/java/com/android/server/SystemServer.java | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 2ee64afc5afd..b87867a06cf1 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1399,6 +1399,10 @@ 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); @@ -1768,13 +1772,6 @@ 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