Add possibility to retrieve displayId for Android

When handling multiple screens in Android system it is needed
to have the information about the display's Id. This patch
provides this possibility.

Task-number: QTBUG-105325
Change-Id: Id91aeaa59b17d5a098b672e220a5182b97320703
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

1 files changed, 6 insertions, 1 deletions

diff --git a/src/plugins/platforms/android/qandroidplatformscreen.h b/src/plugins/platforms/android/qandroidplatformscreen.h
index 390bda0416..076530613b 100644
--- a/src/plugins/platforms/android/qandroidplatformscreen.h
+++ b/src/plugins/platforms/android/qandroidplatformscreen.h
@@ -13,6 +13,7 @@
 #include <QWaitCondition>
 #include <QtCore/QJniObject>
 #include <qpa/qplatformscreen.h>
+#include <qpa/qplatformscreen_p.h>
 
 #include <android/native_window.h>
 
@@ -20,7 +21,9 @@ QT_BEGIN_NAMESPACE
 
 class QAndroidPlatformWindow;
 
-class QAndroidPlatformScreen: public QObject, public QPlatformScreen, public AndroidSurfaceClient
+class QAndroidPlatformScreen: public QObject,
+                              public QPlatformScreen, public AndroidSurfaceClient,
+                              public QNativeInterface::Private::QAndroidScreen
 {
     Q_OBJECT
 public:
@@ -50,6 +53,7 @@ public:
     void scheduleUpdate();
     void topWindowChanged(QWindow *w);
     int rasterSurfaces();
+    int displayId() const override;
 
 public slots:
     void setDirty(const QRect &rect);
@@ -77,6 +81,7 @@ protected:
     QString m_name;
     QList<Mode> m_modes;
     int m_currentMode = 0;
+    int m_displayId = -1;
 
 private:
     QDpi logicalDpi() const override;