From 5aec62930c6eece372a48fd36c959ea01521ef10 Mon Sep 17 00:00:00 2001 From: german77 Date: Sun, 9 Apr 2023 13:34:33 -0600 Subject: [PATCH] android: Remove unsafe null check --- .../src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt index 895d33abf..c0dc8ce76 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/overlay/InputOverlay.kt @@ -8,10 +8,8 @@ import android.content.Context import android.content.SharedPreferences import android.content.res.Configuration import android.graphics.Bitmap -import android.graphics.BitmapFactory import android.graphics.Canvas import android.graphics.Rect -import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.VectorDrawable import android.hardware.Sensor @@ -606,8 +604,8 @@ class InputOverlay(context: Context, attrs: AttributeSet?) : SurfaceView(context // If we have API access, calculate the safe area to draw the overlay var cutoutLeft = 0 var cutoutBottom = 0 - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - val insets = windowInsets.displayCutout!! + val insets = windowInsets.displayCutout + if (insets != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { maxY = if (insets.boundingRectTop.bottom != 0) insets.boundingRectTop.bottom.toFloat() else maxY maxX =