From 798f2b284b20bd6a0a27c941bad6489e43945fb8 Mon Sep 17 00:00:00 2001 From: Manuel Jimenez Date: Wed, 4 Oct 2017 08:28:21 +0200 Subject: [PATCH 1/2] Fixes crash on Android API < 16 --- .../android/event/helper/AndroidEventBuilderHelper.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java b/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java index b66e123724b..892cd2b27c2 100644 --- a/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java +++ b/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java @@ -121,7 +121,9 @@ private Map> getContexts() { ActivityManager.MemoryInfo memInfo = getMemInfo(ctx); if (memInfo != null) { deviceMap.put("free_memory", memInfo.availMem); - deviceMap.put("memory_size", memInfo.totalMem); + if (Build.VERSION.SDK_INT >= 16) { + deviceMap.put("memory_size", memInfo.totalMem); + } deviceMap.put("low_memory", memInfo.lowMemory); } From 6c189fa69f3e08013964e96ea94535f81abf189a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Torres?= Date: Mon, 9 Oct 2017 22:48:46 +0200 Subject: [PATCH 2/2] Use Build.VERSION_CODES instead of magic numbers --- .../sentry/android/event/helper/AndroidEventBuilderHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java b/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java index 892cd2b27c2..c14f5363fa5 100644 --- a/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java +++ b/sentry-android/src/main/java/io/sentry/android/event/helper/AndroidEventBuilderHelper.java @@ -121,7 +121,7 @@ private Map> getContexts() { ActivityManager.MemoryInfo memInfo = getMemInfo(ctx); if (memInfo != null) { deviceMap.put("free_memory", memInfo.availMem); - if (Build.VERSION.SDK_INT >= 16) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { deviceMap.put("memory_size", memInfo.totalMem); } deviceMap.put("low_memory", memInfo.lowMemory);