diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.com> | 2012-09-11 09:36:30 +0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2012-09-11 09:36:30 +0400 |
| commit | b8455f56c5e28ed98520d6f41880db3c609ed127 (patch) | |
| tree | c6e7e17f53355a70f3690f1b02fbccd5dd73154e | |
| parent | 6ee21a702b280fd206faf0084216f4d58c1ef8d2 (diff) | |
| parent | 7a36c401a11ed1fcc54f77ba62f8602e384862c9 (diff) | |
| download | device_samsung_i9300-b8455f56c5e28ed98520d6f41880db3c609ed127.zip device_samsung_i9300-b8455f56c5e28ed98520d6f41880db3c609ed127.tar.gz device_samsung_i9300-b8455f56c5e28ed98520d6f41880db3c609ed127.tar.bz2 | |
Merge "i9300: Enable back forgotten ISO modes (2/2)" into jellybean
| -rw-r--r-- | camerawrapper/CameraWrapper.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/camerawrapper/CameraWrapper.cpp b/camerawrapper/CameraWrapper.cpp index f91604a..18f6da2 100644 --- a/camerawrapper/CameraWrapper.cpp +++ b/camerawrapper/CameraWrapper.cpp @@ -99,8 +99,7 @@ static char * camera_fixup_getparams(int id, const char * settings) params.unflatten(android::String8(settings)); // fix params here -#warning "Reimplement KEY_SUPPORTED_ISO_MODES" -// params.set(android::CameraParameters::KEY_SUPPORTED_ISO_MODES, iso_values[id]); + params.set(android::CameraParameters::KEY_SUPPORTED_ISO_MODES, iso_values[id]); android::String8 strParams = params.flatten(); char *ret = strdup(strParams.string()); @@ -114,7 +113,6 @@ char * camera_fixup_setparams(int id, const char * settings) android::CameraParameters params; params.unflatten(android::String8(settings)); -/* // fix params here if(params.get("iso")) { const char* isoMode = params.get(android::CameraParameters::KEY_ISO_MODE); @@ -127,7 +125,7 @@ char * camera_fixup_setparams(int id, const char * settings) else if(strcmp(isoMode, "ISO800") == 0) params.set(android::CameraParameters::KEY_ISO_MODE, "800"); } -*/ + android::String8 strParams = params.flatten(); char *ret = strdup(strParams.string()); |