summaryrefslogtreecommitdiffstats
path: root/core/jni
diff options
context:
space:
mode:
authorRuben Brunk <rubenbrunk@google.com>2014-08-14 15:57:28 -0700
committerRuben Brunk <rubenbrunk@google.com>2014-08-15 23:51:52 +0000
commita9bc3559109836efe7479a3279713bd58810b153 (patch)
tree8c3ed13a76cc9e8817b4db999fbead445dc68866 /core/jni
parenta2897ea9d8d6eb7c1c0aace695ed835da96bb39c (diff)
downloadframeworks_base-a9bc3559109836efe7479a3279713bd58810b153.zip
frameworks_base-a9bc3559109836efe7479a3279713bd58810b153.tar.gz
frameworks_base-a9bc3559109836efe7479a3279713bd58810b153.tar.bz2
camera2: Fix shim aspect ratio scaling.
Bug: 16494207 Change-Id: I4bd40dee1caaf8c83a0853d48d44cc97151f9b41
Diffstat (limited to 'core/jni')
-rw-r--r--core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
index 697cdc6..4cc36aa 100644
--- a/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
+++ b/core/jni/android_hardware_camera2_legacy_LegacyCameraDevice.cpp
@@ -541,6 +541,15 @@ static jint LegacyCameraDevice_nativeSetSurfaceDimens(JNIEnv* env, jobject thiz,
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);
+ if (err != NO_ERROR) {
+ ALOGE("%s: Error while setting surface user dimens %s (%d).", __FUNCTION__, strerror(-err),
+ err);
+ return err;
+ }
return NO_ERROR;
}