From 14ae58690cf12e82f7d5827ba7467a9dd881b3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Tue, 21 Apr 2015 19:12:15 +0200
Subject: [PATCH] Simplify compat.SupportedArchitectures

---
 .../fdroid/compat/SupportedArchitectures.java | 25 ++++---------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
index 84883c9a1..6023fea05 100644
--- a/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
+++ b/F-Droid/src/org/fdroid/fdroid/compat/SupportedArchitectures.java
@@ -5,33 +5,18 @@ import android.os.Build;
 
 public class SupportedArchitectures extends Compatibility {
 
-    @SuppressWarnings("deprecation")
-    private static final String[] getAbisDonut() {
-        return new String[]{Build.CPU_ABI};
-    }
-
-    @SuppressWarnings("deprecation")
-    @TargetApi(8)
-    private static final String[] getAbisFroyo() {
-        return new String[]{Build.CPU_ABI, Build.CPU_ABI2};
-    }
-
-    @TargetApi(21)
-    private static final String[] getAbisLollipop() {
-        return Build.SUPPORTED_ABIS;
-    }
-
     /**
      * The most preferred ABI is the first element in the list.
      */
-    public static final String[] getAbis() {
+    @SuppressWarnings("deprecation")
+    public static String[] getAbis() {
         if (hasApi(21)) {
-            return getAbisLollipop();
+            return new String[]{Build.CPU_ABI};
         }
         if (hasApi(8)) {
-            return getAbisFroyo();
+            return new String[]{Build.CPU_ABI, Build.CPU_ABI2};
         }
-        return getAbisDonut();
+        return Build.SUPPORTED_ABIS;
     }
 
 }