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

Commit c8311fec authored by Paul Lawrence's avatar Paul Lawrence
Browse files

Revert^2 "Disable trade-in mode service on phones, TV and auto" 

This reverts commit 51f7b73e.

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
parent 3c6c3f7c

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");