diff options
| author | 2025-04-01 10:03:57 -0700 | |
|---|---|---|
| committer | 2025-05-01 14:11:47 -0700 | |
| commit | 1810707f4b443effbef107414becb94883c24902 (patch) | |
| tree | 56abccf4b5dcf122e619d5fc2c2c0a9b09a96691 | |
| parent | dab798923b3c9ed69acf16c3158547997ec556ba (diff) | |
Fix a race condition when testing trade-in mode.
It's possible for trade-in mode to race with normal userdebug adbd when
using "tradeinmode testing start". We previously tried to fix this using
property triggers, but it's cleaner to simply set the tradeinmode
persist property before rebooting.
Bug: 381182849
Flag: EXEMPT bugfix
Test: adb shell tradeinmode testing start
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5590c89745001afea1b1aaad665204e1ea5a03b)
Merged-In: Ibb07c379f0947721a11c6fc521bf3c784b54016c
Change-Id: Ibb07c379f0947721a11c6fc521bf3c784b54016c
| -rw-r--r-- | services/core/java/com/android/server/TradeInModeService.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/TradeInModeService.java b/services/core/java/com/android/server/TradeInModeService.java index 6cf9b7b33674..11f337e3b780 100644 --- a/services/core/java/com/android/server/TradeInModeService.java +++ b/services/core/java/com/android/server/TradeInModeService.java @@ -283,6 +283,7 @@ public final class TradeInModeService extends SystemService { private void enterTestMode() { SystemProperties.set(TIM_TEST_PROP, "1"); + SystemProperties.set(TIM_PROP, Integer.toString(TIM_STATE_FOYER)); } private void leaveTestMode() { |