Merge "Revert^2 "Disable trade-in mode service on phones, TV and auto"" into main (2c1d501b) · Commits · e / os / android_frameworks_base

services/java/com/android/server/SystemServer.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -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");