diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-02-12 05:33:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-12 05:33:28 +0000 |
| commit | a5f301c7fb048461197a6032f66b35772a3157f9 (patch) | |
| tree | 83914d51a56d5fb334ea9347990eea5e82537a51 /core | |
| parent | c7ccc393b470220710f566d447412d93f7f8d21b (diff) | |
| parent | b0acf7fcfab08b5af1f99daa51bedbb659d18926 (diff) | |
| download | frameworks_base-a5f301c7fb048461197a6032f66b35772a3157f9.zip frameworks_base-a5f301c7fb048461197a6032f66b35772a3157f9.tar.gz frameworks_base-a5f301c7fb048461197a6032f66b35772a3157f9.tar.bz2 | |
Merge "Legacy: Only set user surface dimensions on output surfaces" into lmp-mr1-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp index b27add8..0a6fb9d 100644 --- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp +++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp @@ -598,15 +598,10 @@ static jint LegacyCameraDevice_nativeSetSurfaceDimens(JNIEnv* env, jobject thiz, ALOGE("%s: Could not retrieve native window from surface.", __FUNCTION__); return BAD_VALUE; } - status_t err = native_window_set_buffers_dimensions(anw.get(), width, height); - if (err != NO_ERROR) { - ALOGE("%s: Error while setting surface dimens %s (%d).", __FUNCTION__, strerror(-err), err); - return err; - } - // WAR - Set user dimensions also to avoid incorrect scaling after TextureView orientation - // change. - err = native_window_set_buffers_user_dimensions(anw.get(), width, height); + // Set user dimensions only + // The producer dimensions are owned by GL + status_t err = native_window_set_buffers_user_dimensions(anw.get(), width, height); if (err != NO_ERROR) { ALOGE("%s: Error while setting surface user dimens %s (%d).", __FUNCTION__, strerror(-err), err); @@ -750,4 +745,3 @@ int register_android_hardware_camera2_legacy_LegacyCameraDevice(JNIEnv* env) gCameraDeviceMethods, NELEM(gCameraDeviceMethods)); } - |