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

Commit 236c2711 authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix warnings in... 

Merge "Fix warnings in frameworks/native/services/surfaceflinger/tests/fakehwc" into stage-aosp-master am: 60175af9
am: 0b7c1b21

Change-Id: I64037f95296d38a0fc26a7e82c63c586a3c02687
parents cb9e282a 0b7c1b21

services/surfaceflinger/tests/fakehwc/FakeComposerClient.cpp

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ void FakeComposerClient::clearFrames() { 
}



void FakeComposerClient::onSurfaceFlingerStart() {

    mSurfaceComposer == nullptr;

    mSurfaceComposer = nullptr;

    do {

        mSurfaceComposer = new android::SurfaceComposerClient;

        android::status_t initResult = mSurfaceComposer->initCheck();

services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ void DisplayTest::SetUp() { 
    sp<ComposerClient> client = new ComposerClient(*mMockComposer);

    mMockComposer->setClient(client.get());

    mFakeService = new FakeComposerService(client);

    mFakeService->registerAsService("mock");

    (void)mFakeService->registerAsService("mock");



    android::hardware::ProcessState::self()->startThreadPool();

    android::ProcessState::self()->startThreadPool();
@@ -323,7 +323,7 @@ void TransactionTest::SetUpTestCase() { 
    sp<ComposerClient> client = new ComposerClient(*sFakeComposer);

    sFakeComposer->setClient(client.get());

    sp<IComposer> fakeService = new FakeComposerService(client);

    fakeService->registerAsService("mock");

    (void)fakeService->registerAsService("mock");



    android::hardware::ProcessState::self()->startThreadPool();

    android::ProcessState::self()->startThreadPool();