commit 0b7c1b21ad49df72d8405ca39b180ab10a740ec2
author Chih-hung Hsieh <chh@google.com> Wed Dec 06 00:24:30 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Dec 06 00:24:30 2017 +0000
tree 1cd881f9064ff87b323810246c7c9062edaa5938
parent 6459c5bc0d44a7f08232adbb9e4d9c72cdf88c82
parent 60175af9c8938d2362ec8a8b06543ce8c41b2338

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

Change-Id: I29b1edd487725933ffcf4e2eeb8c79281a2a14f5

services/surfaceflinger/tests/fakehwc/FakeComposerClient.cpp

diff --git a/services/surfaceflinger/tests/fakehwc/FakeComposerClient.cpp b/services/surfaceflinger/tests/fakehwc/FakeComposerClient.cpp
index 60916f3..561db8d 100644
--- a/services/surfaceflinger/tests/fakehwc/FakeComposerClient.cpp
+++ b/services/surfaceflinger/tests/fakehwc/FakeComposerClient.cpp
@@ -582,7 +582,7 @@
 }
 
 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

diff --git a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp
index 8902ede..68fefea 100644
--- a/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp
+++ b/services/surfaceflinger/tests/fakehwc/SFFakeHwc_test.cpp
@@ -163,7 +163,7 @@
     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();
@@ -325,7 +325,7 @@
     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();