From 6e7578a0e08abdd38c9d8114308e0737c2b99346 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 7 Apr 2015 19:11:59 +0100
Subject: [PATCH] Don't try to access Build.CPU_ABI2 on API version 7.
---
.../src/org/briarproject/android/CrashReportActivity.java | 6 ++++--
.../src/org/briarproject/plugins/tor/TorPluginFactory.java | 4 +++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java
index 3bc3c810df..769229d43b 100644
--- a/briar-android/src/org/briarproject/android/CrashReportActivity.java
+++ b/briar-android/src/org/briarproject/android/CrashReportActivity.java
@@ -201,16 +201,18 @@ public class CrashReportActivity extends Activity implements OnClickListener {
int sdk = Build.VERSION.SDK_INT;
statusMap.put("Android version:", release + " (" + sdk + ")");
- // CPU architecture
+ // CPU architectures
String arch = null;
if(Build.VERSION.SDK_INT >= 21) {
for(String abi : Build.SUPPORTED_ABIS) {
if(arch == null) arch = abi;
else arch = arch + ", " + abi;
}
- } else {
+ } else if(Build.VERSION.SDK_INT >= 8) {
if(Build.CPU_ABI2 == null) arch = Build.CPU_ABI;
else arch = Build.CPU_ABI + ", " + Build.CPU_ABI2;
+ } else {
+ arch = Build.CPU_ABI;
}
statusMap.put("Architecture:", arch);
diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java b/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
index fb9c6231b8..9c49b389ca 100644
--- a/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
+++ b/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
@@ -46,9 +46,11 @@ public class TorPluginFactory implements DuplexPluginFactory {
List<String> abis = new ArrayList<String>();
if(Build.VERSION.SDK_INT >= 21) {
for(String abi : Build.SUPPORTED_ABIS) abis.add(abi);
- } else {
+ } else if(Build.VERSION.SDK_INT >= 8) {
abis.add(Build.CPU_ABI);
if(Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
+ } else {
+ abis.add(Build.CPU_ABI);
}
boolean supported = false;
for(String abi : abis) if(abi.startsWith("armeabi")) supported = true;
--
GitLab