Merge "AOSP/Camera2 - Set HAS_RENDERSCRIPT to false as RenderScript will not be supported."
diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index 471ee05..d04e52c 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -58,9 +58,8 @@
 
     public static final boolean HAS_HIDEYBARS = isKitKatOrHigher();
 
-    // Don't use renderscript for x86 K, L is OK. See b/18435492
-    public static final boolean HAS_RENDERSCRIPT =
-            !(Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT && X86ABI.equals(Build.CPU_ABI));
+    // Don't use renderscript. See b/18435492.
+    public static final boolean HAS_RENDERSCRIPT = false;
 
     public static final boolean IS_NEXUS_4 = "mako".equalsIgnoreCase(Build.DEVICE);
     public static final boolean IS_NEXUS_5 = "LGE".equalsIgnoreCase(Build.MANUFACTURER)