Merge "Allow ITradeInMode to be used on ro.debuggable builds." into main (7f04dacc) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/TradeInModeService.java

+11 −6

Original line number	Diff line number	Diff line
		@@ -137,12 +137,13 @@ public final class TradeInModeService extends SystemService {
		Slog.i(TAG, "Not starting trade-in mode, device is setup.");
		return false;
		}
		if (SystemProperties.getInt("ro.debuggable", 0) == 1) {
		if (isDebuggable()) {
		if (!isForceEnabledForTesting()) {
		// We don't want to force adbd into TIM on debug builds.
		Slog.e(TAG, "Not starting trade-in mode, device is debuggable.");
		return false;
		}
		if (isAdbEnabled()) {
		} else if (isAdbEnabled()) {
		Slog.e(TAG, "Not starting trade-in mode, adb is already enabled.");
		return false;
		}
		@@ -234,6 +235,10 @@ public final class TradeInModeService extends SystemService {
		return SystemProperties.getInt("ro.debuggable", 0) == 1;
		}

		private boolean isForceEnabledForTesting() {
		return SystemProperties.getInt("persist.adb.test_tradeinmode", 0) == 1;
		}

		private boolean isAdbEnabled() {
		final ContentResolver cr = mContext.getContentResolver();
		return Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 1;