From: Rebecca Schultz Zavin <rebecca@android.com>
Date: Fri, 22 Mar 2013 20:49:08 +0000 (-0700)
Subject: Switch camera allocations to the system heap.
X-Git-Tag: cm-10.2-M1^2~13
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=601acb664031226cf9883908c793d364c2e07e63;p=GitHub%2FLineageOS%2Fandroid_hardware_samsung_slsi_exynos5.git

Switch camera allocations to the system heap.

The exynos heap is sometimes failing.

Bug:8049715
Change-Id: Id1a25ea1ce44f26693c5ee9a72d6c5a5126b9b69
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
---

diff --git a/libcamera2/ExynosCameraHWInterface2.cpp b/libcamera2/ExynosCameraHWInterface2.cpp
index 9b8406e..8f4f5cd 100644
--- a/libcamera2/ExynosCameraHWInterface2.cpp
+++ b/libcamera2/ExynosCameraHWInterface2.cpp
@@ -6062,7 +6062,7 @@ int ExynosCameraHWInterface2::allocCameraMemory(ion_client ionClient, ExynosBuff
         else
             flag = 0;
         buf->fd.extFd[i] = ion_alloc(ionClient, \
-                                      buf->size.extS[i], 0, ION_HEAP_EXYNOS_MASK, flag);
+                                      buf->size.extS[i], 0, ION_HEAP_SYSTEM_MASK, flag);
         if ((buf->fd.extFd[i] == -1) ||(buf->fd.extFd[i] == 0)) {
             ALOGE("[%s]ion_alloc(%d) failed\n", __FUNCTION__, buf->size.extS[i]);
             buf->fd.extFd[i] = -1;