Merge "Allow Test Harness Mode when secure ADB is disabled" into rvc-dev am:... (ca160778) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/adb/AdbService.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -137,12 +137,12 @@ public class AdbService extends IAdbManager.Stub {

		@Override
		public File getAdbKeysFile() {
		return mDebuggingManager.getUserKeyFile();
		return mDebuggingManager == null ? null : mDebuggingManager.getUserKeyFile();
		}

		@Override
		public File getAdbTempKeysFile() {
		return mDebuggingManager.getAdbTempKeysFile();
		return mDebuggingManager == null ? null : mDebuggingManager.getAdbTempKeysFile();
		}

		@Override

+6 −8

Original line number	Diff line number	Diff line
		@@ -176,9 +176,13 @@ public class TestHarnessModeService extends SystemService {
		private void setUpAdbFiles(PersistentData persistentData) {
		AdbManagerInternal adbManager = LocalServices.getService(AdbManagerInternal.class);

		if (adbManager.getAdbKeysFile() != null) {
		writeBytesToFile(persistentData.mAdbKeys, adbManager.getAdbKeysFile().toPath());
		}
		if (adbManager.getAdbTempKeysFile() != null) {
		writeBytesToFile(persistentData.mAdbTempKeys, adbManager.getAdbTempKeysFile().toPath());
		}
		}

		private void configureUser() {
		UserInfo primaryUser = getPrimaryUser();
		@@ -310,12 +314,6 @@ public class TestHarnessModeService extends SystemService {
		AdbManagerInternal adbManager = LocalServices.getService(AdbManagerInternal.class);
		File adbKeys = adbManager.getAdbKeysFile();
		File adbTempKeys = adbManager.getAdbTempKeysFile();
		if (adbKeys == null && adbTempKeys == null) {
		// This should only be accessible on eng builds that haven't yet set up ADB keys
		getErrPrintWriter()
		.println("No ADB keys stored; not enabling test harness mode");
		return 1;
		}

		try {
		byte[] adbKeysBytes = getBytesFromFile(adbKeys);