Merge pull request #851 from warting/use-display-manager

Use DisplayManager directly instead of using WindowManager
mixpanel · Jan 30, 2025 · 3133844 · 3133844
2 parents 85b4da1 + a9f93b0
commit 3133844
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -77,6 +77,12 @@ allprojects {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
 configurations.all {
     resolutionStrategy {
         force "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.22"

diff --git a/mixpaneldemo/build.gradle.kts b/mixpaneldemo/build.gradle.kts
@@ -49,6 +49,12 @@ android {
     }
 }
 
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(8)
+    }
+}
+
 dependencies {
     implementation("androidx.core:core-ktx:1.13.1")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.8.4")

diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,7 @@
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.9.0'
+}
+
 include ":"
 rootProject.name = "mixpanel-android"
 include ':mixpanel-android'

diff --git a/src/main/java/com/mixpanel/android/mpmetrics/SystemInformation.java b/src/main/java/com/mixpanel/android/mpmetrics/SystemInformation.java
@@ -11,13 +11,13 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.hardware.display.DisplayManager;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Build;
 import android.telephony.TelephonyManager;
 import android.util.DisplayMetrics;
 import android.view.Display;
-import android.view.WindowManager;
 
 import com.mixpanel.android.util.MPLog;
 
@@ -88,8 +88,15 @@ private SystemInformation(Context context) {
         mHasTelephony = foundTelephony;
         mDisplayMetrics = new DisplayMetrics();
 
-        Display display = ((WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
-        display.getMetrics(mDisplayMetrics);
+        DisplayManager displayManager = (DisplayManager) mContext.getSystemService(Context.DISPLAY_SERVICE);
+        Display display = (displayManager != null) ? displayManager.getDisplay(Display.DEFAULT_DISPLAY) : null;
+
+        if (display != null) {
+            display.getMetrics(mDisplayMetrics);
+        } else {
+            DisplayMetrics defaultMetrics = mContext.getResources().getDisplayMetrics();
+            mDisplayMetrics.setTo(defaultMetrics);
+        }
     }
 
     public String getAppVersionName() { return mAppVersionName; }