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

Commit 536f46fe authored by Paul Lawrence's avatar Paul Lawrence Committed by Android (Google) Code Review
Browse files

Merge "Flag trade in mode service correctly" into main

parents fdf6929d f2632364

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

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import static android.system.OsConstants.O_RDONLY; 
import static android.view.Display.DEFAULT_DISPLAY;



import static com.android.server.utils.TimingsTraceAndSlog.SYSTEM_SERVER_TIMING_TAG;

import static com.android.tradeinmode.flags.Flags.enableTradeInMode;



import android.annotation.NonNull;

import android.annotation.StringRes;
@@ -1769,7 +1770,7 @@ public final class SystemServer implements Dumpable { 
                t.traceEnd();

            }



            if (!isWatch && !isTv && !isAutomotive) {

            if (!isWatch && !isTv && !isAutomotive && enableTradeInMode()) {

                t.traceBegin("StartTradeInModeService");

                mSystemServiceManager.startService(TradeInModeService.class);

                t.traceEnd();