commit c1b16c41f48519c0d48e97f3766adac39e764c73
author Steven Moreland <smoreland@google.com> Thu Nov 04 23:04:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 04 23:04:23 2021 +0000
tree ed1b696a3224793b2bbdfa945584bfb9d1c0b653
parent 3b0cf130b7e44bce2eb2c64c0f9981f8b9ed309a
parent 183580eaf71a1ea47511027885cae07534f66156

Merge "Mark IDisplayService as deprecated." am: 4c57537e73 am: 8a6dc3976c am: 59a742c237 am: f757fa6fd8 am: 183580eaf7

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

Change-Id: If38e65092b33cc1e62cf3d4e2f5f5e2e69bb3a8c

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**) {