From bbfd15a9570cca6d0afbb0359dca2dd402e75611 Mon Sep 17 00:00:00 2001 From: William Hester Date: Mon, 6 May 2019 16:23:47 -0700 Subject: Start THM outside of the frp block Starting TestHarnessModeService outside of the FRP block will allow OEMs to provide their own implementation of PersistentDataBlockManagerInternal in LocalServices, which will allow them to satisfy all CTS requirements even without supporting Factory Reset Protection. Bug: 131439285 Test: make && adb shell cmd testharness enable Change-Id: If3ea192a22105716cab1dbed832f8c20b51058b7 (cherry picked from commit 87ac4ea4a586457f84a9534526486ace4152b635) --- services/java/com/android/server/SystemServer.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'services/java/com/android/server/SystemServer.java') diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 4ac8342e6e60..b94795fe0b45 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -1206,12 +1206,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"); -- cgit v1.2.3