Snap for 5671254 from 3acd4afe09360e50a23dfb9b2f2d7bd33cc9ca03 to qt-releaseandroid-vts-10.0_r9android-vts-10.0_r8android-vts-10.0_r7android-vts-10.0_r6android-vts-10.0_r5android-vts-10.0_r4android-vts-10.0_r3android-vts-10.0_r2android-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-vts-10.0_r12android-vts-10.0_r11android-vts-10.0_r10android-vts-10.0_r1android-security-10.0.0_r75android-security-10.0.0_r74android-security-10.0.0_r73android-security-10.0.0_r72android-security-10.0.0_r71android-security-10.0.0_r70android-security-10.0.0_r69android-security-10.0.0_r68android-security-10.0.0_r67android-security-10.0.0_r66android-security-10.0.0_r65android-security-10.0.0_r64android-security-10.0.0_r63android-security-10.0.0_r62android-security-10.0.0_r61android-security-10.0.0_r60android-security-10.0.0_r59android-security-10.0.0_r58android-security-10.0.0_r57android-security-10.0.0_r56android-security-10.0.0_r55android-security-10.0.0_r54android-security-10.0.0_r53android-security-10.0.0_r52android-security-10.0.0_r51android-security-10.0.0_r50android-security-10.0.0_r49android-security-10.0.0_r48android-cts-10.0_r9android-cts-10.0_r8android-cts-10.0_r7android-cts-10.0_r6android-cts-10.0_r5android-cts-10.0_r4android-cts-10.0_r3android-cts-10.0_r2android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android-cts-10.0_r12android-cts-10.0_r11android-cts-10.0_r10android-cts-10.0_r1android-10.0.0_r6android-10.0.0_r5android-10.0.0_r47android-10.0.0_r46android-10.0.0_r4android-10.0.0_r3android-10.0.0_r2android-10.0.0_r17android-10.0.0_r11android-10.0.0_r10android-10.0.0_r1android10-tests-releaseandroid10-security-releaseandroid10-s3-releaseandroid10-s2-releaseandroid10-s1-releaseandroid10-release

Change-Id: Icbfacb60ac6582ad71f33498df6725bf9ea4f81e

3 files changed, 8 insertions, 3 deletions

diff --git a/atrace/AtraceDevice.cpp b/atrace/AtraceDevice.cpp
index 26e56966..c673275b 100644
--- a/atrace/AtraceDevice.cpp
+++ b/atrace/AtraceDevice.cpp
@@ -84,7 +84,7 @@ Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::enableCategories
         if (kTracingMap.count(c)) {
             for (auto &p : kTracingMap.at(c).paths) {
                 if (!android::base::WriteStringToFile("1", p.first)) {
-                    LOG(ERROR) << "Failed to disable tracing on: " << p.first;
+                    LOG(ERROR) << "Failed to enable tracing on: " << p.first;
                     if (p.second) {
                         // disable before return
                         disableAllCategories();
@@ -104,7 +104,7 @@ Return<::android::hardware::atrace::V1_0::Status> AtraceDevice::disableAllCatego
     for (auto &c : kTracingMap) {
         for (auto &p : c.second.paths) {
             if (!android::base::WriteStringToFile("0", p.first)) {
-                LOG(ERROR) << "Failed to enable tracing on: " << p.first;
+                LOG(ERROR) << "Failed to disable tracing on: " << p.first;
                 if (p.second) {
                     ret = Status::ERROR_TRACING_POINT;
                 }
diff --git a/atrace/android.hardware.atrace@1.0-service.pixel.rc b/atrace/android.hardware.atrace@1.0-service.pixel.rc
index ef50fd0a..b26296d5 100644
--- a/atrace/android.hardware.atrace@1.0-service.pixel.rc
+++ b/atrace/android.hardware.atrace@1.0-service.pixel.rc
@@ -17,3 +17,5 @@ service vendor.atrace-hal-1-0 /vendor/bin/hw/android.hardware.atrace@1.0-service
     class early_hal
     user system
     group system
+    oneshot
+    disabled
diff --git a/atrace/service.cpp b/atrace/service.cpp
index 423c39d0..3164aa26 100644
--- a/atrace/service.cpp
+++ b/atrace/service.cpp
@@ -16,6 +16,7 @@
 
 #define LOG_TAG "android.hardware.atrace@1.0-service.pixel"
 
+#include <hidl/HidlLazyUtils.h>
 #include <hidl/HidlSupport.h>
 #include <hidl/HidlTransportSupport.h>
 
@@ -25,13 +26,15 @@ using ::android::OK;
 using ::android::sp;
 using ::android::hardware::configureRpcThreadpool;
 using ::android::hardware::joinRpcThreadpool;
+using ::android::hardware::LazyServiceRegistrar;
 using ::android::hardware::atrace::V1_0::IAtraceDevice;
 using ::android::hardware::atrace::V1_0::implementation::AtraceDevice;
 
 int main(int /* argc */, char * /* argv */ []) {
     sp<IAtraceDevice> atrace = new AtraceDevice;
     configureRpcThreadpool(1, true /* will join */);
-    if (atrace->registerAsService() != OK) {
+    auto serviceRegistrar = std::make_shared<LazyServiceRegistrar>();
+    if (serviceRegistrar->registerService(atrace) != OK) {
         ALOGE("Could not register service.");
         return 1;
     }