diff options
| author | Shuzhen Wang <shuzhenw@codeaurora.org> | 2013-05-12 22:23:52 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2013-05-13 12:58:41 -0700 |
| commit | 78d57b341924fdf8803625b999c24924de115090 (patch) | |
| tree | ab9907d602b8994d02d96e6610da51a641f9f6b3 /camera | |
| parent | e45a47104a38d0729d60cf3aa70df603b7eddac6 (diff) | |
| download | mako-78d57b341924fdf8803625b999c24924de115090.tar.gz | |
camera: Do not use content protected heap for camera
Content protected heap is used for secure playback
only.
Bug: 8771380
Change-Id: I653cc072e6b1e6ea42ab888de0edc4950d65c7a1
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'camera')
| -rwxr-xr-x | camera/Android.mk | 4 | ||||
| -rw-r--r-- | camera/QCamera/HAL/core/Android.mk | 2 | ||||
| -rw-r--r-- | camera/QCameraHWI_Parm.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index d34c60c..7fdb7b2 100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -30,8 +30,8 @@ ifeq ($(USE_DEVICE_SPECIFIC_CAMERA),true) LOCAL_CFLAGS += -DUSE_ION endif - LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_CP_MM_HEAP_ID # 8660=SMI, Rest=EBI - LOCAL_CFLAGS += -DCAMERA_ZSL_ION_HEAP_ID=ION_CP_MM_HEAP_ID + LOCAL_CFLAGS += -DCAMERA_ION_HEAP_ID=ION_IOMMU_HEAP_ID + LOCAL_CFLAGS += -DCAMERA_ZSL_ION_HEAP_ID=ION_IOMMU_HEAP_ID ifeq ($(TARGET_BOARD_PLATFORM),msm8960) LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_SYSTEM_HEAP diff --git a/camera/QCamera/HAL/core/Android.mk b/camera/QCamera/HAL/core/Android.mk index f8ea0aa..5e78377 100644 --- a/camera/QCamera/HAL/core/Android.mk +++ b/camera/QCamera/HAL/core/Android.mk @@ -20,7 +20,7 @@ LOCAL_CFLAGS+= -DHW_ENCODE LOCAL_CFLAGS+= -DUSE_NEON_CONVERSION ifeq ($(call is-board-platform,msm8960),true) - LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_MM_HEAP + LOCAL_CFLAGS += -DCAMERA_GRALLOC_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP LOCAL_CFLAGS += -DCAMERA_GRALLOC_FALLBACK_HEAP_ID=GRALLOC_USAGE_PRIVATE_IOMMU_HEAP LOCAL_CFLAGS += -DCAMERA_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID LOCAL_CFLAGS += -DCAMERA_ZSL_ION_FALLBACK_HEAP_ID=ION_IOMMU_HEAP_ID diff --git a/camera/QCameraHWI_Parm.cpp b/camera/QCameraHWI_Parm.cpp index 959178e..2745c24 100644 --- a/camera/QCameraHWI_Parm.cpp +++ b/camera/QCameraHWI_Parm.cpp @@ -3821,7 +3821,7 @@ status_t QCameraHardwareInterface::setHistogram(int histogram_en) } mHistServer.size = sizeof(camera_preview_histogram_info); #ifdef USE_ION - if(allocate_ion_memory(&mHistServer, cnt, ION_CP_MM_HEAP_ID) < 0) { + if(allocate_ion_memory(&mHistServer, cnt, ION_IOMMU_HEAP_ID) < 0) { ALOGE("%s ION alloc failed\n", __func__); return -1; } |