summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-12-22 03:42:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-22 03:42:00 +0000
commitfeb45b268c836752f8f4361300c6e5a53d19a726 (patch)
treeed39dd3f88a3a51515756b22c00bc58d1bfeafa2
parent8d993baa70357dcb3f781876cb1bfbda2b14923e (diff)
parent70ae0c10bbf77844a177454319137edcf463e985 (diff)
downloadCamera2-feb45b268c836752f8f4361300c6e5a53d19a726.tar.gz
Merge "AOSP/Camera2 - Set HAS_RENDERSCRIPT to false as RenderScript will not be supported." am: 4421ab3625 am: 683d3e33dd am: 4440b4eeaa am: 70ae0c10bb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1930713 Change-Id: I68222c4f9721eb341464a3e536a4c12176f3f0ad
-rw-r--r--src/com/android/camera/util/ApiHelper.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/com/android/camera/util/ApiHelper.java b/src/com/android/camera/util/ApiHelper.java
index 471ee0599..d04e52c66 100644
--- a/src/com/android/camera/util/ApiHelper.java
+++ b/src/com/android/camera/util/ApiHelper.java
@@ -58,9 +58,8 @@ public class ApiHelper {
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)