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

Commit 74a2eb62 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update CarWindowService"

parents 415974eb 4ff8fb00

services/automotive/display/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ cc_binary { 
    name: "android.frameworks.automotive.display@1.0-service",

    defaults: ["hidl_defaults"],

    srcs: [

        "main_automotivedisplay.cpp",

        "CarWindowService.cpp",

        "main_automotivedisplayproxy.cpp",

        "AutomotiveDisplayProxyService.cpp",

    ],

    init_rc: ["android.frameworks.automotive.display@1.0-service.rc"],

services/automotive/display/CarWindowService.cpp→services/automotive/display/AutomotiveDisplayProxyService.cpp

+4 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 


#include <gui/bufferqueue/2.0/B2HGraphicBufferProducer.h>



#include "CarWindowService.h"

#include "AutomotiveDisplayProxyService.h"



namespace android {

namespace frameworks {
@@ -28,7 +28,7 @@ namespace V1_0 { 
namespace implementation {



Return<sp<IGraphicBufferProducer>>

    CarWindowService::getIGraphicBufferProducer() {

AutomotiveDisplayProxyService::getIGraphicBufferProducer() {

    if (mSurface == nullptr) {

        status_t err;

        mSurfaceComposerClient = new SurfaceComposerClient();
@@ -86,7 +86,7 @@ Return<sp<IGraphicBufferProducer>> 
                        mSurface->getIGraphicBufferProducer());

}



Return<bool> CarWindowService::showWindow() {

Return<bool> AutomotiveDisplayProxyService::showWindow() {

    status_t status = NO_ERROR;



    if (mSurfaceControl != nullptr) {
@@ -103,7 +103,7 @@ Return<bool> CarWindowService::showWindow() { 
    return status == NO_ERROR;

}



Return<bool> CarWindowService::hideWindow() {

Return<bool> AutomotiveDisplayProxyService::hideWindow() {

    status_t status = NO_ERROR;



    if (mSurfaceControl != nullptr) {

services/automotive/display/include/CarWindowService.h→services/automotive/display/include/AutomotiveDisplayProxyService.h

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
//

#pragma once



#include <android/frameworks/automotive/display/1.0/ICarWindowService.h>

#include <android/frameworks/automotive/display/1.0/IAutomotiveDisplayProxyService.h>

#include <gui/ISurfaceComposer.h>

#include <gui/IGraphicBufferProducer.h>

#include <gui/Surface.h>
@@ -34,7 +34,7 @@ using ::android::hardware::Return; 
using ::android::sp;

using ::android::hardware::graphics::bufferqueue::V2_0::IGraphicBufferProducer;



class CarWindowService : public ICarWindowService {

class AutomotiveDisplayProxyService : public IAutomotiveDisplayProxyService {

public:

    Return<sp<IGraphicBufferProducer>> getIGraphicBufferProducer() override;

    Return<bool> showWindow() override;

services/automotive/display/main_automotivedisplay.cpp→services/automotive/display/main_automotivedisplayproxy.cpp

+3 −3
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 
#include <utils/Errors.h>

#include <utils/StrongPointer.h>



#include "CarWindowService.h"

#include "AutomotiveDisplayProxyService.h"



// libhidl:

using android::hardware::configureRpcThreadpool;

using android::hardware::joinRpcThreadpool;



// Generated HIDL files

using android::frameworks::automotive::display::V1_0::ICarWindowService;

using android::frameworks::automotive::display::V1_0::IAutomotiveDisplayProxyService;



// The namespace in which all our implementation code lives

using namespace android::frameworks::automotive::display::V1_0::implementation;
@@ -41,7 +41,7 @@ const static char kServiceName[] = "default"; 
int main() {

    ALOGI("Car Window Service is starting");



    android::sp<ICarWindowService> service = new CarWindowService();

    android::sp<IAutomotiveDisplayProxyService> service = new AutomotiveDisplayProxyService();



    configureRpcThreadpool(1, true /* callerWillJoin */);