commit 80ee966054b748b5f4f8e2a257b46052a451db0e
author maxwen <max.weninger@gmail.com> Tue Oct 05 21:08:06 2021 +0200
committer maxwen <max.weninger@gmail.com> Tue Oct 05 21:08:06 2021 +0200
tree f3e40010bfeba497deb1f14e4dbde772560783db
parent ad0a922253b23702accfc9cdaa1f48dcd1aa1bdb

update for android S

Change-Id: I02763a134f592280652d4cd7eb2eea630d01ee14

src/AndroidDesktop.cpp

diff --git a/src/AndroidDesktop.cpp b/src/AndroidDesktop.cpp
index 253eefe..0234d0a 100644
--- a/src/AndroidDesktop.cpp
+++ b/src/AndroidDesktop.cpp
@@ -7,8 +7,6 @@
 #include <gui/ISurfaceComposer.h>
 #include <gui/SurfaceComposerClient.h>
 
-#include <ui/DisplayInfo.h>
-
 #include <rfb/PixelFormat.h>
 #include <rfb/Rect.h>
 #include <rfb/ScreenSet.h>
@@ -163,18 +161,12 @@
         return -1;
     }
 
-    status_t err = SurfaceComposerClient::getDisplayInfo(displayToken, &mDisplayInfo);
-    if (err != NO_ERROR) {
-        ALOGE("Failed to get display characteristics\n");
-        return err;
-    }
-    
-    err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &mDisplayConfig);
+    status_t err = SurfaceComposerClient::getActiveDisplayMode(displayToken, &mDisplayMode);
     if (err != NO_ERROR) {
         ALOGE("Failed to get display configuration\n");
         return err;
     }
-    ALOGV("updateDisplayInfo: [%d:%d]", mDisplayConfig.resolution.width, mDisplayConfig.resolution.height);
+    ALOGV("updateDisplayInfo: [%d:%d]", mDisplayMode.resolution.width, mDisplayMode.resolution.height);
 
     err = SurfaceComposerClient::getDisplayState(displayToken, &mDisplayState);
     if (err != NO_ERROR) {
@@ -182,7 +174,7 @@
         return err;
     }
 
-    mPixels->setDisplayInfo(&mDisplayConfig, &mDisplayState);
+    mPixels->setDisplayInfo(&mDisplayMode, &mDisplayState);
 
     return NO_ERROR;
 }
@@ -199,7 +191,7 @@
           mDisplayRect.getHeight(), width, height);
 
     mVirtualDisplay.clear();
-    mVirtualDisplay = new VirtualDisplay(&mDisplayConfig,  &mDisplayState,
+    mVirtualDisplay = new VirtualDisplay(&mDisplayMode,  &mDisplayState,
                                          mPixels->width(), mPixels->height(), this);
 
     mDisplayRect = mVirtualDisplay->getDisplayRect();