[merge] Disable flipper on sdk 21 to fix crash
Change-Id: I64286edca783ac83ee3531d8017e1d7209e51867
This commit is contained in:
parent
9ef870b927
commit
a6953afc1e
|
@ -17,6 +17,7 @@
|
||||||
package im.vector.app.flipper
|
package im.vector.app.flipper
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.os.Build
|
||||||
import com.facebook.flipper.android.AndroidFlipperClient
|
import com.facebook.flipper.android.AndroidFlipperClient
|
||||||
import com.facebook.flipper.android.utils.FlipperUtils
|
import com.facebook.flipper.android.utils.FlipperUtils
|
||||||
import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin
|
import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin
|
||||||
|
@ -42,6 +43,8 @@ class FlipperProxy @Inject constructor(
|
||||||
private val networkFlipperPlugin = NetworkFlipperPlugin()
|
private val networkFlipperPlugin = NetworkFlipperPlugin()
|
||||||
|
|
||||||
fun init(matrix: Matrix) {
|
fun init(matrix: Matrix) {
|
||||||
|
// https://github.com/facebook/flipper/issues/3572
|
||||||
|
if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) return
|
||||||
SoLoader.init(context, false)
|
SoLoader.init(context, false)
|
||||||
|
|
||||||
if (FlipperUtils.shouldEnableFlipper(context)) {
|
if (FlipperUtils.shouldEnableFlipper(context)) {
|
||||||
|
|
Loading…
Reference in New Issue