Address PR feedback (#4481)

* Address PR feeback

* Cleanup

Author: markushi

sentry-android-replay/src/main/java/io/sentry/android/replay/util/SystemProperties.kt

@@ -1,34 +1,21 @@
 package io.sentry.android.replay.util
 
-import android.annotation.SuppressLint
 import android.os.Build
-import java.lang.reflect.Method
 
 internal object SystemProperties {
-    // from https://cs.android.com/android/platform/superproject/main/+/main:out/soong/.intermediates/system/libsysprop/srcs/PlatformProperties/android_common/xref/srcjars.xref/android/sysprop/SocProperties.java;l=163-171
-    // these props are not available on API < 31 via Build, so we use reflection to access them
-    const val SOC_MODEL = "ro.soc.model"
-    const val SOC_MANUFACTURER = "ro.soc.manufacturer"
-
-    @delegate:SuppressLint("PrivateApi")
-    private val getProperty: Method by lazy {
-        val clazz = Class.forName("android.os.SystemProperties")
-        clazz.getMethod("get", String::class.java)
+    enum class Property {
+        SOC_MODEL,
+        SOC_MANUFACTURER
     }
 
-    fun get(key: String, defaultValue: String = ""): String {
-        return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            try {
-                getProperty.invoke(null, key) as? String ?: defaultValue
-            } catch (e: Throwable) {
-                defaultValue
-            }
-        } else {
+    fun get(key: Property, defaultValue: String = ""): String {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
             when (key) {
-                SOC_MODEL -> Build.SOC_MODEL
-                SOC_MANUFACTURER -> Build.SOC_MANUFACTURER
-                else -> throw IllegalArgumentException("Unknown system property: $key")
+                Property.SOC_MODEL -> Build.SOC_MODEL
+                Property.SOC_MANUFACTURER -> Build.SOC_MANUFACTURER
             }
+        } else {
+            defaultValue
         }
     }
 }

sentry-android-replay/src/main/java/io/sentry/android/replay/video/SimpleVideoEncoder.kt

@@ -169,7 +169,7 @@ internal class SimpleVideoEncoder(
         val canvas = if (
             Build.MANUFACTURER.contains("xiaomi", ignoreCase = true) ||
             Build.MANUFACTURER.contains("motorola", ignoreCase = true) ||
-            SystemProperties.get(SystemProperties.SOC_MODEL).equals("T606", ignoreCase = true)
+            SystemProperties.get(SystemProperties.Property.SOC_MODEL).equals("T606", ignoreCase = true)
         ) {
             surface?.lockCanvas(null)
         } else {