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

Commit 87f1176f authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Merge "Revert "Disable trade-in mode service on phones, TV and auto"" into main

parents 639c83f3 51f7b73e

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

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