commit 173657ea512be12ac66e69d587c50806de84b141
author Andrew Scull <ascull@google.com> Wed May 24 13:49:44 2017 +0100
committer Andrew Scull <ascull@google.com> Wed May 24 17:08:16 2017 +0100
tree 721917525cb9ef4e613b9eaa15bf1e5f76cc9b50
parent 5b8f7923540000d8861746a930c46e402821d89d

esed: remove OemLock HAL instantiation

This is no longer implemented in the eSE so esed no longer implements
the HAL.

Bug: 62052545
Test: Build and boot
Change-Id: I7d5e25f8263400fab6d594b31d7a56fd8f501045

esed/Android.bp

diff --git a/esed/Android.bp b/esed/Android.bp
index c5a2005..997329f 100644
--- a/esed/Android.bp
+++ b/esed/Android.bp
@@ -38,13 +38,11 @@
     srcs: [
         "esed.cpp",
         "Weaver.cpp",
-        "OemLock.cpp",
     ],
     init_rc = ["esed.rc"],
     defaults: ["esed_defaults"],
     shared_libs: [
         "android.hardware.weaver@1.0",
-        "android.hardware.oemlock@1.0",
         "libese",
         "libbase",
         "libese-app-boot",

esed/esed.cpp

diff --git a/esed/esed.cpp b/esed/esed.cpp
index afc994c..044a957 100644
--- a/esed/esed.cpp
+++ b/esed/esed.cpp
@@ -26,7 +26,6 @@
 #include <esecpp/NxpPn80tNqNci.h>
 using EseInterfaceImpl = android::NxpPn80tNqNci;
 
-#include "OemLock.h"
 #include "Weaver.h"
 
 using android::OK;
@@ -38,7 +37,6 @@
 using namespace std::chrono_literals;
 
 // HALs
-using android::esed::OemLock;
 using android::esed::Weaver;
 
 int main(int /* argc */, char** /* argv */) {
@@ -75,23 +73,14 @@
     constexpr bool thisThreadWillJoinPool = true;
     configureRpcThreadpool(1, thisThreadWillJoinPool);
 
-    // -- Instantiate other applet HALs here --
-    status_t status;
-
-    // Create OemLock HAL instance.
-    sp<OemLock> oemLock = new OemLock{ese};
-    status = oemLock->registerAsService();
-    if (status != OK) {
-        LOG(ERROR) << "Failed to register OemLock as a service (status: " << status << ")";
-    }
-
     // Create Weaver HAL instance
     sp<Weaver> weaver = new Weaver{ese};
-    status = weaver->registerAsService();
+    const status_t status = weaver->registerAsService();
     if (status != OK) {
         LOG(ERROR) << "Failed to register Weaver as a service (status: " << status << ")";
     }
 
+
     joinRpcThreadpool();
     return -1; // Should never reach here
 }

esed/tests/Android.bp

diff --git a/esed/tests/Android.bp b/esed/tests/Android.bp
index c5ec65a..b5f504e 100644
--- a/esed/tests/Android.bp
+++ b/esed/tests/Android.bp
@@ -20,12 +20,10 @@
     proprietary: true,
     srcs: [
         "weaver_integration_tests.cpp",
-        "oemlock_integration_tests.cpp",
     ],
     host_supported: false,
     shared_libs: [
         "android.hardware.weaver@1.0",
-        "android.hardware.oemlock@1.0",
         "libbase",
         "libhidlbase",
         "libhidltransport",