commit 59a742c2370ff6fb8bdb209174c0ab981745e77d
author Steven Moreland <smoreland@google.com> Thu Nov 04 22:23:13 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 04 22:23:13 2021 +0000
tree bbf30cf6977c4616cb2255de950a9afc0aac39a6
parent 894ab92124c2bb1792aa19ace879e98b3e320e9b
parent 8a6dc3976c47519ba1311f66e08a35a3a969bce9

Merge "Mark IDisplayService as deprecated." am: 4c57537e73 am: 8a6dc3976c

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1880610

Change-Id: I0444fccfbeeb669281653bb53b0c68d393f03fdf

services/surfaceflinger/main_surfaceflinger.cpp

diff --git a/services/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp
index 673239d..caeff4a 100644
--- a/services/surfaceflinger/main_surfaceflinger.cpp
+++ b/services/surfaceflinger/main_surfaceflinger.cpp
@@ -63,18 +63,17 @@
     return OK;
 }
 
-static status_t startDisplayService() {
+static void startDisplayService() {
     using android::frameworks::displayservice::V1_0::implementation::DisplayService;
     using android::frameworks::displayservice::V1_0::IDisplayService;
 
     sp<IDisplayService> displayservice = new DisplayService();
     status_t err = displayservice->registerAsService();
 
+    // b/141930622
     if (err != OK) {
-        ALOGE("Could not register IDisplayService service.");
+        ALOGE("Did not register (deprecated) IDisplayService service.");
     }
-
-    return err;
 }
 
 int main(int, char**) {