Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-21 07:09:56 +01:00
Code Issues Projects Releases Wiki Activity

Don't try to access Build.CPU_ABI2 on API version 7.

Browse Source
This commit is contained in:
akwizgran
2015-04-07 19:11:59 +01:00
parent f2d3e4cb81
commit 6e7578a0e0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
briar-android/src/org/briarproject/android/CrashReportActivity.java
View File

@@ -201,16 +201,18 @@ public class CrashReportActivity extends Activity implements OnClickListener {
int sdk = Build.VERSION.SDK_INT; int sdk = Build.VERSION.SDK_INT;
statusMap.put("Android version:", release + " (" + sdk + ")"); statusMap.put("Android version:", release + " (" + sdk + ")");
// CPU architecture // CPU architectures
String arch = null; String arch = null;
if(Build.VERSION.SDK_INT >= 21) { if(Build.VERSION.SDK_INT >= 21) {
for(String abi : Build.SUPPORTED_ABIS) { for(String abi : Build.SUPPORTED_ABIS) {
if(arch == null) arch = abi; if(arch == null) arch = abi;
else arch = arch + ", " + abi; else arch = arch + ", " + abi;
} }
} else { } else if(Build.VERSION.SDK_INT >= 8) {
if(Build.CPU_ABI2 == null) arch = Build.CPU_ABI; if(Build.CPU_ABI2 == null) arch = Build.CPU_ABI;
else arch = Build.CPU_ABI + ", " + Build.CPU_ABI2; else arch = Build.CPU_ABI + ", " + Build.CPU_ABI2;
} else {
arch = Build.CPU_ABI;
} }
statusMap.put("Architecture:", arch); statusMap.put("Architecture:", arch);

4
briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java
View File

@@ -46,9 +46,11 @@ public class TorPluginFactory implements DuplexPluginFactory {
List<String> abis = new ArrayList<String>(); List<String> abis = new ArrayList<String>();
if(Build.VERSION.SDK_INT >= 21) { if(Build.VERSION.SDK_INT >= 21) {
for(String abi : Build.SUPPORTED_ABIS) abis.add(abi); for(String abi : Build.SUPPORTED_ABIS) abis.add(abi);
} else { } else if(Build.VERSION.SDK_INT >= 8) {
abis.add(Build.CPU_ABI); abis.add(Build.CPU_ABI);
if(Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2); if(Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2);
} else {
abis.add(Build.CPU_ABI);
} }
boolean supported = false; boolean supported = false;
for(String abi : abis) if(abi.startsWith("armeabi")) supported = true; for(String abi : abis) if(abi.startsWith("armeabi")) supported = true;