summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-12-22 02:53:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-12-22 02:53:13 +0000
commit683d3e33dd4c75ec4d92081caf9b119bf40ebfd5 (patch)
tree46149e8d76bf0d315c6c0acf920dc9fd9ee9f1dd
parent22232e99f7dd2b328a2e1f6408538b9b3d0a6a4b (diff)
parent4421ab3625890951825eb9222054b9261d036891 (diff)
downloadCamera2-683d3e33dd4c75ec4d92081caf9b119bf40ebfd5.tar.gz
Merge "AOSP/Camera2 - Set HAS_RENDERSCRIPT to false as RenderScript will not be supported." am: 4421ab3625
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Camera2/+/1930713 Change-Id: I4a5cf872c4ad17316fad939344efc89a8e3e47f2
-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)