commit ad0a922253b23702accfc9cdaa1f48dcd1aa1bdb
author maxwen <max.weninger@gmail.com> Sun Sep 20 14:40:41 2020 +0200
committer maxwen <max.weninger@gmail.com> Sun Sep 20 14:40:41 2020 +0200
tree 2c24784df2584fe855711d6984a1e029d6338aa2
parent ec24ebe1d043d41228b77adf814fe0fd47b6bfc7

update for android R

Change-Id: I8e7d60aa34739bf0365a62f95cd1fcf04576f132

src/AndroidDesktop.cpp

diff --git a/src/AndroidDesktop.cpp b/src/AndroidDesktop.cpp
index 90f1699..253eefe 100644
--- a/src/AndroidDesktop.cpp
+++ b/src/AndroidDesktop.cpp
@@ -168,9 +168,21 @@
         ALOGE("Failed to get display characteristics\n");
         return err;
     }
-    //ALOGV("updateDisplayInfo: [%d:%d]", mDisplayInfo.w, mDisplayInfo.h);
+    
+    err = SurfaceComposerClient::getActiveDisplayConfig(displayToken, &mDisplayConfig);
+    if (err != NO_ERROR) {
+        ALOGE("Failed to get display configuration\n");
+        return err;
+    }
+    ALOGV("updateDisplayInfo: [%d:%d]", mDisplayConfig.resolution.width, mDisplayConfig.resolution.height);
 
-    mPixels->setDisplayInfo(&mDisplayInfo);
+    err = SurfaceComposerClient::getDisplayState(displayToken, &mDisplayState);
+    if (err != NO_ERROR) {
+        ALOGE("Failed to get current display status");
+        return err;
+    }
+
+    mPixels->setDisplayInfo(&mDisplayConfig, &mDisplayState);
 
     return NO_ERROR;
 }
@@ -187,7 +199,8 @@
           mDisplayRect.getHeight(), width, height);
 
     mVirtualDisplay.clear();
-    mVirtualDisplay = new VirtualDisplay(&mDisplayInfo, mPixels->width(), mPixels->height(), this);
+    mVirtualDisplay = new VirtualDisplay(&mDisplayConfig,  &mDisplayState,
+                                         mPixels->width(), mPixels->height(), this);
 
     mDisplayRect = mVirtualDisplay->getDisplayRect();