From 67ef574fcfeb20c7a59dab9f6efb6016e03906bc Mon Sep 17 00:00:00 2001
From: Paul Lawrence <paullawrence@google.com>
Date: Mon, 4 Nov 2024 13:00:56 -0800
Subject: Make sure we turn off trade-in mode

On reboot, trade-in mode was not being turned off when network
connections were made.

Test: SUW, reboot, add network, make sure adb disconnects
Bug: 307713521
Flag: com.android.tradeinmode.flags.enable_trade_in_mode
Change-Id: I13dd94834e56a36e6c775378012e5bdcc37ff212
---
 services/core/java/com/android/server/TradeInModeService.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/TradeInModeService.java b/services/core/java/com/android/server/TradeInModeService.java
index 9ad550b6caf9..70a033086261 100644
--- a/services/core/java/com/android/server/TradeInModeService.java
+++ b/services/core/java/com/android/server/TradeInModeService.java
@@ -110,6 +110,8 @@ public final class TradeInModeService extends SystemService {
                     stopTradeInMode();
                 } else {
                     watchForSetupCompletion();
+                    watchForNetworkChange();
+                    watchForAccountsCreated();
                 }
             }
         }
-- 
cgit v1.2.3-59-g8ed1b