mirror of
https://github.com/facebook/react-native.git
synced 2026-11-18 20:19:07 +00:00
Guard WindowManager access in DisplayMetricsHolder for non-visual contexts (#55810)
Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/55810 `DisplayMetricsHolder.initDisplayMetrics()` calls `context.getSystemService(WINDOW_SERVICE)` which throws `IllegalAccessException` on Android 11+ (API 30+) when called from a non-visual context (e.g. Application context). Multiple callers pass non-Activity contexts (ReactHostImpl, UIManagerModule, DeviceInfoModule, ReactInstance, ReactInstanceManager). This adds a try-catch around the WindowManager access as defense-in-depth. When it fails, `screenDisplayMetrics` retains the values already copied from resource display metrics via `setTo()`, which is a graceful degradation (only missing system decor dimensions like nav bar height). Changelog: [Internal] - Guard WindowManager access in DisplayMetricsHolder against non-visual contexts on API 30+ Reviewed By: javache, mdvacca Differential Revision: D94283765 fbshipit-source-id: 51c3ead60784d30d74fcb9111924aed3ca8483ec
This commit is contained in:
1 parent
83d7c46f16
commit
ca7edaf491
2 files changed
+37
-10
No files matched your search
+11
-8
@@ -7,6 +7,7 @@
|
||||
|
||||
package com.facebook.react.uimanager
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.util.DisplayMetrics
|
||||
@@ -61,19 +62,21 @@ public object DisplayMetricsHolder {
|
||||
}
|
||||
|
||||
@JvmStatic
|
||||
@Suppress("DEPRECATION")
|
||||
@SuppressLint("DeprecatedMethod") // for Andriod Lint
|
||||
@Suppress("DEPRECATION") // for Kotlin compiler
|
||||
public fun initDisplayMetrics(context: Context) {
|
||||
val displayMetrics = context.resources.displayMetrics
|
||||
windowDisplayMetrics = displayMetrics
|
||||
val screenDisplayMetrics = DisplayMetrics()
|
||||
screenDisplayMetrics.setTo(displayMetrics)
|
||||
val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
|
||||
// Get the real display metrics if we are using API level 17 or higher.
|
||||
// The real metrics include system decor elements (e.g. soft menu bar).
|
||||
//
|
||||
// See:
|
||||
// http://developer.android.com/reference/android/view/Display.html#getRealMetrics(android.util.DisplayMetrics)
|
||||
wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
|
||||
try {
|
||||
val wm = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
|
||||
// getRealMetrics includes system decor (e.g. nav bar) excluded from resource metrics.
|
||||
wm.defaultDisplay.getRealMetrics(screenDisplayMetrics)
|
||||
} catch (_: Exception) {
|
||||
// Non-visual contexts (e.g. Application) may throw on API 30+.
|
||||
// Falls back to resource display metrics copied via setTo() above.
|
||||
}
|
||||
// Preserve fontScale from the configuration because getRealMetrics() returns
|
||||
// physical display metrics without the system font scale setting.
|
||||
// This is needed for proper text scaling when fontScale < 1.0
|
||||
|
||||
+26
-2
@@ -10,13 +10,13 @@
|
||||
|
||||
package com.facebook.react.uimanager
|
||||
|
||||
import android.annotation.TargetApi
|
||||
import android.app.Activity
|
||||
import android.content.Context
|
||||
import android.util.DisplayMetrics
|
||||
import android.view.View
|
||||
import android.view.Window
|
||||
import android.view.WindowInsets
|
||||
import androidx.annotation.RequiresApi
|
||||
import com.facebook.react.bridge.WritableMap
|
||||
import com.facebook.testutils.shadows.ShadowNativeLoader
|
||||
import com.facebook.testutils.shadows.ShadowNativeMap
|
||||
@@ -133,7 +133,7 @@ class DisplayMetricsHolderTest {
|
||||
}
|
||||
|
||||
@Test
|
||||
@TargetApi(30)
|
||||
@RequiresApi(30)
|
||||
fun getEncodedScreenSizeWithoutVerticalInsets_returnsEncodedValue() {
|
||||
DisplayMetricsHolder.initDisplayMetrics(context)
|
||||
|
||||
@@ -183,4 +183,28 @@ class DisplayMetricsHolderTest {
|
||||
|
||||
assertThat(screenMetrics.scaledDensity).isEqualTo(customScaledDensity)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun initDisplayMetrics_doesNotCrashWithNonVisualContext() {
|
||||
val mockContext: Context = mock()
|
||||
val mockResources: android.content.res.Resources = mock()
|
||||
val metrics = DisplayMetrics()
|
||||
metrics.density = 2.0f
|
||||
metrics.scaledDensity = 2.0f
|
||||
metrics.widthPixels = 1080
|
||||
metrics.heightPixels = 1920
|
||||
metrics.densityDpi = DisplayMetrics.DENSITY_XHIGH
|
||||
|
||||
whenever(mockContext.resources).thenReturn(mockResources)
|
||||
whenever(mockResources.displayMetrics).thenReturn(metrics)
|
||||
whenever(mockContext.getSystemService(Context.WINDOW_SERVICE))
|
||||
.thenThrow(IllegalStateException("non-visual context"))
|
||||
|
||||
// Should not throw
|
||||
DisplayMetricsHolder.initDisplayMetrics(mockContext)
|
||||
|
||||
// Metrics should still be set from resource display metrics
|
||||
assertThat(DisplayMetricsHolder.getWindowDisplayMetrics()).isNotNull()
|
||||
assertThat(DisplayMetricsHolder.getScreenDisplayMetrics()).isNotNull()
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user