Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Start THM outside of the frp block"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-07 03:19:34 +00:00
committed by Android (Google) Code Review
parent 646d65cd48 87ac4ea4a5
commit 2ff05e710b
2 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
services/core/java/com/android/server/testharness/TestHarnessModeService.java
View File

@@ -105,9 +105,8 @@ public class TestHarnessModeService extends SystemService {
*/
private void setUpTestHarnessMode() {
Slog.d(TAG, "Setting up test harness mode");
byte[] testHarnessModeData = getPersistentDataBlock().getTestHarnessModeData();
if (testHarnessModeData == null || testHarnessModeData.length == 0) {
// There's no data to apply, so leave it as-is.
byte[] testHarnessModeData = getTestHarnessModeData();
if (testHarnessModeData == null) {
return;
}
// If there is data, we should set the device as provisioned, so that we skip the setup
@@ -125,9 +124,8 @@ public class TestHarnessModeService extends SystemService {
private void completeTestHarnessModeSetup() {
Slog.d(TAG, "Completing Test Harness Mode setup.");
byte[] testHarnessModeData = getPersistentDataBlock().getTestHarnessModeData();
if (testHarnessModeData == null || testHarnessModeData.length == 0) {
// There's no data to apply, so leave it as-is.
byte[] testHarnessModeData = getTestHarnessModeData();
if (testHarnessModeData == null) {
return;
}
try {
@@ -145,6 +143,21 @@ public class TestHarnessModeService extends SystemService {
}
}
private byte[] getTestHarnessModeData() {
PersistentDataBlockManagerInternal blockManager = getPersistentDataBlock();
if (blockManager == null) {
Slog.e(TAG, "Failed to start Test Harness Mode; no implementation of "
+ "PersistentDataBlockManagerInternal was bound!");
return null;
}
byte[] testHarnessModeData = blockManager.getTestHarnessModeData();
if (testHarnessModeData == null || testHarnessModeData.length == 0) {
// There's no data to apply, so leave it as-is.
return null;
}
return testHarnessModeData;
}
private void configureSettings() {
ContentResolver cr = getContext().getContentResolver();
@@ -309,7 +322,14 @@ public class TestHarnessModeService extends SystemService {
byte[] adbTempKeysBytes = getBytesFromFile(adbTempKeys);
PersistentData persistentData = new PersistentData(adbKeysBytes, adbTempKeysBytes);
getPersistentDataBlock().setTestHarnessModeData(persistentData.toBytes());
PersistentDataBlockManagerInternal blockManager = getPersistentDataBlock();
if (blockManager == null) {
Slog.e(TAG, "Failed to enable Test Harness Mode. No implementation of "
+ "PersistentDataBlockManagerInternal was bound.");
getErrPrintWriter().println("Failed to enable Test Harness Mode");
return 1;
}
blockManager.setTestHarnessModeData(persistentData.toBytes());
} catch (IOException e) {
Slog.e(TAG, "Failed to store ADB keys.", e);
getErrPrintWriter().println("Failed to enable Test Harness Mode");

8
services/java/com/android/server/SystemServer.java
View File

@@ -1212,12 +1212,12 @@ public final class SystemServer {
traceBeginAndSlog("StartPersistentDataBlock");
mSystemServiceManager.startService(PersistentDataBlockService.class);
traceEnd();
traceBeginAndSlog("StartTestHarnessMode");
mSystemServiceManager.startService(TestHarnessModeService.class);
traceEnd();
}
traceBeginAndSlog("StartTestHarnessMode");
mSystemServiceManager.startService(TestHarnessModeService.class);
traceEnd();
if (hasPdb || OemLockService.isHalPresent()) {
// Implementation depends on pdb or the OemLock HAL
traceBeginAndSlog("StartOemLockService");