diff options
| -rwxr-xr-x | BoardConfig.mk | 4 | ||||
| -rw-r--r-- | camera/CameraWrapper.cpp | 18 | ||||
| -rwxr-xr-x | releasetools/n7000_ota_from_target_files | 2 |
3 files changed, 24 insertions, 0 deletions
diff --git a/BoardConfig.mk b/BoardConfig.mk index 0c5dbf6..047cd99 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -87,6 +87,7 @@ BOARD_USES_MFC_FPS := true # Audio BOARD_USE_YAMAHAPLAYER := true BOARD_USE_SAMSUNG_SEPARATEDSTREAM := true +BOARD_HAS_SAMSUNG_VOLUME_BUG := true # RIL BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0" @@ -96,6 +97,9 @@ BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0" #BOARD_GLOBAL_CFLAGS += -DHAVE_FM_RADIO #BOARD_FM_DEVICE := si4709 +# Camera +COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE + # WiFi (BCM4330) BOARD_WLAN_DEVICE := bcmdhd BOARD_WLAN_DEVICE_REV := bcm4330_b1 diff --git a/camera/CameraWrapper.cpp b/camera/CameraWrapper.cpp index a605b08..9154216 100644 --- a/camera/CameraWrapper.cpp +++ b/camera/CameraWrapper.cpp @@ -96,6 +96,8 @@ const static char * video_preview_sizes[] = { "640x480,352x288,320x240,176x144" }; +const static char * iso_values[] = {"auto,ISO50,ISO100,ISO200,ISO400,ISO800","auto"}; + static char * camera_fixup_getparams(int id, const char * settings) { android::CameraParameters params; @@ -110,6 +112,8 @@ static char * camera_fixup_getparams(int id, const char * settings) params.set(android::CameraParameters::KEY_PREVIEW_SIZE, videoSize); } + params.set(android::CameraParameters::KEY_SUPPORTED_ISO_MODES, iso_values[id]); + android::String8 strParams = params.flatten(); char *ret = strdup(strParams.string()); @@ -129,6 +133,20 @@ char * camera_fixup_setparams(int id, const char * settings) params.set(android::CameraParameters::KEY_SUPPORTED_VIDEO_SIZES, video_preview_sizes[id]); } + if(params.get("iso")) { + const char* isoMode = params.get(android::CameraParameters::KEY_ISO_MODE); + if(strcmp(isoMode, "ISO50") == 0) + params.set(android::CameraParameters::KEY_ISO_MODE, "50"); + else if(strcmp(isoMode, "ISO100") == 0) + params.set(android::CameraParameters::KEY_ISO_MODE, "100"); + else if(strcmp(isoMode, "ISO200") == 0) + params.set(android::CameraParameters::KEY_ISO_MODE, "200"); + else if(strcmp(isoMode, "ISO400") == 0) + params.set(android::CameraParameters::KEY_ISO_MODE, "400"); + else if(strcmp(isoMode, "ISO800") == 0) + params.set(android::CameraParameters::KEY_ISO_MODE, "800"); + } + android::String8 strParams = params.flatten(); char *ret = strdup(strParams.string()); diff --git a/releasetools/n7000_ota_from_target_files b/releasetools/n7000_ota_from_target_files index 53a2893..f19f059 100755 --- a/releasetools/n7000_ota_from_target_files +++ b/releasetools/n7000_ota_from_target_files @@ -61,7 +61,9 @@ def WriteFullOTAPackage(input_zip, output_zip): AppendAssertions(script, input_zip) device_specific.FullOTA_Assertions() if OPTIONS.backuptool: + script.Mount("/system") script.RunBackup("backup") + script.Unmount("/system") script.ShowProgress(0.5, 0) |