commit 9dcd4d16af2cb2464484336f222e288add6f9df9
author maxwen <max.weninger@gmail.com> Sat Dec 07 01:23:56 2019 +0100
committer maxwen <max.weninger@gmail.com> Sat Dec 07 01:35:40 2019 +0100
tree cf7ceed1f908f45478a2c22214a7c07397ae657f
parent 7185075c5abed02f44ade859863a3068680f4cf4

fix build errors

src/AndroidDesktop.cpp

diff --git a/src/AndroidDesktop.cpp b/src/AndroidDesktop.cpp
index b40b1b4..190ca86 100644
--- a/src/AndroidDesktop.cpp
+++ b/src/AndroidDesktop.cpp
@@ -38,8 +38,6 @@
 }
 
 void AndroidDesktop::start(rfb::VNCServer* vs) {
-    mMainDpy = SurfaceComposerClient::getBuiltInDisplay(ISurfaceComposer::eDisplayIdMain);
-
     mServer = vs;
 
     mPixels = new AndroidPixelBuffer();
@@ -157,7 +155,13 @@
 
 // refresh the display dimensions
 status_t AndroidDesktop::updateDisplayInfo() {
-    status_t err = SurfaceComposerClient::getDisplayInfo(mMainDpy, &mDisplayInfo);
+    const auto displayToken = SurfaceComposerClient::getInternalDisplayToken();
+    if (displayToken == nullptr) {
+        ALOGE("Failed to get display token\n");
+        return -1;
+    }
+
+    status_t err = SurfaceComposerClient::getDisplayInfo(displayToken, &mDisplayInfo);
     if (err != NO_ERROR) {
         ALOGE("Failed to get display characteristics\n");
         return err;

src/AndroidDesktop.h

diff --git a/src/AndroidDesktop.h b/src/AndroidDesktop.h
index f9f82de..1ceecc2 100644
--- a/src/AndroidDesktop.h
+++ b/src/AndroidDesktop.h
@@ -78,7 +78,6 @@
     sp<VirtualDisplay> mVirtualDisplay;
 
     // Primary display
-    sp<IBinder> mMainDpy;
     DisplayInfo mDisplayInfo;
 
     // Virtual input device

src/VirtualDisplay.cpp

diff --git a/src/VirtualDisplay.cpp b/src/VirtualDisplay.cpp
index 8000f8f..7692dc4 100644
--- a/src/VirtualDisplay.cpp
+++ b/src/VirtualDisplay.cpp
@@ -52,12 +52,17 @@
 
     mDpy = SurfaceComposerClient::createDisplay(String8("VNC-VirtualDisplay"), false /*secure*/);
 
-    SurfaceComposerClient::openGlobalTransaction();
-    SurfaceComposerClient::setDisplaySurface(mDpy, mProducer);
+    const auto displayToken = SurfaceComposerClient::getInternalDisplayToken();
+    if (displayToken == nullptr) {
+        ALOGE("Failed to get display token\n");
+        return;
+    }
 
-    SurfaceComposerClient::setDisplayProjection(mDpy, 0, mSourceRect, displayRect);
-    SurfaceComposerClient::setDisplayLayerStack(mDpy, 0);  // default stack
-    SurfaceComposerClient::closeGlobalTransaction();
+    SurfaceComposerClient::Transaction t;
+    t.setDisplaySurface(displayToken, mProducer);
+    t.setDisplayProjection(displayToken, 0, mSourceRect, displayRect);
+    t.setDisplayLayerStack(displayToken, 0);  // default stack
+    t.apply();
 
     ALOGV("Virtual display (%ux%u [viewport=%ux%u] created", width, height, displayRect.getWidth(),
           displayRect.getHeight());