-
-
Notifications
You must be signed in to change notification settings - Fork 468
fix(replay): Fix crash on devices with the Unisoc/Spreadtrum T606 chipset #4477
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
ac71155
fix(replay): Do not capture replay for cached events
romtsn 657df53
Changelog
romtsn 3b91e97
Formatting
romtsn 22c3d61
Wording
romtsn b34457b
Merge branch 'main' into rz/fix/session-replay-cached-events
romtsn 07191f4
Merge branch 'main' into rz/fix/session-replay-cached-events
romtsn dc6152b
Still caputre replay for outbox events
romtsn 0e72325
fix(replay): Fix crash on devices with the Unisoc/Spreadtrum T606 chi…
romtsn 2d0864c
Merge branch 'main' into rz/fix/session-replay-unisoc-chipset
romtsn b3d48de
typo
romtsn f269e08
Changelog
romtsn 8849dcd
Address PR feedback (#4481)
markushi 1a88c04
Merge branch 'main' into rz/fix/session-replay-unisoc-chipset
markushi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
34 changes: 34 additions & 0 deletions
34
sentry-android-replay/src/main/java/io/sentry/android/replay/util/SystemProperties.kt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| 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) | ||
| } | ||
|
|
||
| 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 { | ||
| when (key) { | ||
| SOC_MODEL -> Build.SOC_MODEL | ||
| SOC_MANUFACTURER -> Build.SOC_MANUFACTURER | ||
| else -> throw IllegalArgumentException("Unknown system property: $key") | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.