fix WindowManager crash on android 11+ (#832)

segmentio · May 12, 2023 · 000349d · 000349d
1 parent 3f55ae7
commit 000349d
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/analytics/src/main/java/com/segment/analytics/AnalyticsContext.java b/analytics/src/main/java/com/segment/analytics/AnalyticsContext.java
@@ -340,10 +340,17 @@ public AnalyticsContext putReferrer(Referrer referrer) {
      */
     void putScreen(Context context) {
         Map<String, Object> screen = createMap();
-        WindowManager manager = getSystemService(context, Context.WINDOW_SERVICE);
-        Display display = manager.getDefaultDisplay();
         DisplayMetrics displayMetrics = new DisplayMetrics();
-        display.getMetrics(displayMetrics);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            context.getDisplay().getRealMetrics(displayMetrics);
+        }
+        else {
+            WindowManager manager = getSystemService(context, Context.WINDOW_SERVICE);
+            Display display = manager.getDefaultDisplay();
+            display.getMetrics(displayMetrics);
+        }
+
         screen.put(SCREEN_DENSITY_KEY, displayMetrics.density);
         screen.put(SCREEN_HEIGHT_KEY, displayMetrics.heightPixels);
         screen.put(SCREEN_WIDTH_KEY, displayMetrics.widthPixels);