Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1b16c41 authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "Mark IDisplayService as deprecated." am: 4c57537e am: 8a6dc397 am:... 

Merge "Mark IDisplayService as deprecated." am: 4c57537e am: 8a6dc397 am: 59a742c2 am: f757fa6f am: 183580ea

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

Change-Id: If38e65092b33cc1e62cf3d4e2f5f5e2e69bb3a8c
parents 3b0cf130 183580ea

services/surfaceflinger/main_surfaceflinger.cpp

+3 −4
Original line number Original line Diff line number Diff line
@@ -63,18 +63,17 @@ static status_t startGraphicsAllocatorService() { 
    return OK;

    return OK;

}

}





static status_t startDisplayService() {

static void startDisplayService() {

    using android::frameworks::displayservice::V1_0::implementation::DisplayService;

    using android::frameworks::displayservice::V1_0::implementation::DisplayService;

    using android::frameworks::displayservice::V1_0::IDisplayService;

    using android::frameworks::displayservice::V1_0::IDisplayService;





    sp<IDisplayService> displayservice = new DisplayService();

    sp<IDisplayService> displayservice = new DisplayService();

    status_t err = displayservice->registerAsService();

    status_t err = displayservice->registerAsService();





    // b/141930622

    if (err != OK) {

    if (err != OK) {

        ALOGE("Could not register IDisplayService service.");

        ALOGE("Did not register (deprecated) IDisplayService service.");

    }

    }



    return err;

}

}





int main(int, char**) {

int main(int, char**) {