From b3d4763ef6ec58cc351f586ccbddee4e5ba07dbf Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Thu, 6 May 2021 20:31:06 -0500
Subject: [PATCH] Fix native screen resolution on devices running Lollipop and
 earlier

Fixes #967
---
 .../limelight/preferences/StreamSettings.java | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/limelight/preferences/StreamSettings.java b/app/src/main/java/com/limelight/preferences/StreamSettings.java
index f2451ab7..ae8789dc 100644
--- a/app/src/main/java/com/limelight/preferences/StreamSettings.java
+++ b/app/src/main/java/com/limelight/preferences/StreamSettings.java
@@ -15,6 +15,7 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.util.DisplayMetrics;
 import android.util.Range;
 import android.view.Display;
 import android.view.LayoutInflater;
@@ -28,6 +29,7 @@ import com.limelight.binding.video.MediaCodecHelper;
 import com.limelight.utils.Dialog;
 import com.limelight.utils.UiHelper;
 
+import java.lang.reflect.Method;
 import java.util.Arrays;
 
 public class StreamSettings extends Activity {
@@ -334,12 +336,30 @@ public class StreamSettings extends Activity {
                     // Never remove 720p
                 }
             }
-            else {
-                Display display = getActivity().getWindowManager().getDefaultDisplay();
-                int width = Math.max(display.getWidth(), display.getHeight());
-                int height = Math.min(display.getWidth(), display.getHeight());
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+                // On Android 4.2 and later, we can get the true metrics via the
+                // getRealMetrics() function (unlike the lies that getWidth() and getHeight()
+                // tell to us).
+                DisplayMetrics metrics = new DisplayMetrics();
+                getActivity().getWindowManager().getDefaultDisplay().getRealMetrics(metrics);
+                int width = Math.max(metrics.widthPixels, metrics.heightPixels);
+                int height = Math.min(metrics.widthPixels, metrics.heightPixels);
                 addNativeResolutionEntry(width, height);
             }
+            else {
+                // On Android 4.1, we have to resort to reflection to invoke hidden APIs
+                // to get the real screen dimensions.
+                Display display = getActivity().getWindowManager().getDefaultDisplay();
+                try {
+                    Method getRawHeightFunc = Display.class.getMethod("getRawHeight");
+                    Method getRawWidthFunc = Display.class.getMethod("getRawWidth");
+                    int width = (Integer) getRawWidthFunc.invoke(display);
+                    int height = (Integer) getRawHeightFunc.invoke(display);
+                    addNativeResolutionEntry(Math.max(width, height), Math.min(width, height));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
 
             if (!PreferenceConfiguration.readPreferences(this.getActivity()).unlockFps) {
                 // We give some extra room in case the FPS is rounded down