Merge "SystemServer: initialize ADB before USB" (b2454538) · Commits · e / os / android_frameworks_base

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

+9 −9

Original line number	Diff line number	Diff line
		@@ -1398,6 +1398,15 @@ public final class SystemServer {
		traceEnd();
		}

		// Start ADB Debugging Service
		traceBeginAndSlog("StartAdbService");
		try {
		mSystemServiceManager.startService(ADB_SERVICE_CLASS);
		} catch (Throwable e) {
		Slog.e(TAG, "Failure starting AdbService");
		}
		traceEnd();

		if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST)
		\|\| mPackageManager.hasSystemFeature(
		PackageManager.FEATURE_USB_ACCESSORY)
		@@ -1408,15 +1417,6 @@ public final class SystemServer {
		traceEnd();
		}

		// Start ADB Debugging Service
		traceBeginAndSlog("StartAdbService");
		try {
		mSystemServiceManager.startService(ADB_SERVICE_CLASS);
		} catch (Throwable e) {
		Slog.e(TAG, "Failure starting AdbService");
		}
		traceEnd();

		if (!isWatch) {
		traceBeginAndSlog("StartSerialService");
		try {