diff options
| author | Paul Rohde <codelogic@google.com> | 2015-03-23 16:47:32 -0700 |
|---|---|---|
| committer | Paul Rohde <codelogic@google.com> | 2015-03-23 16:50:02 -0700 |
| commit | 0ee271c0d50bffa5f83177c74fbcb6806004591f (patch) | |
| tree | 7f5701f55cf9962b6eef0a8daf6d5bc43b87b2a5 /src/com/android/camera/CameraActivity.java | |
| parent | 7ecd24520b56ec39766bbbbc12cbfa46a1c9b060 (diff) | |
| download | android_packages_apps_Camera2-0ee271c0d50bffa5f83177c74fbcb6806004591f.tar.gz android_packages_apps_Camera2-0ee271c0d50bffa5f83177c74fbcb6806004591f.tar.bz2 android_packages_apps_Camera2-0ee271c0d50bffa5f83177c74fbcb6806004591f.zip | |
Limit maximum display size to prevent out of memory problems.
Change-Id: Id681ab9f66d6a5f10f9df8fb6ae57ce90f5e25d8
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 3ef2f3475..d8b1497c3 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -1428,14 +1428,14 @@ public class CameraActivity extends QuickActivity // for displaying images. glide.setMemoryCategory(MemoryCategory.HIGH); - Size glTextureSize = GlideFilmstripManager.getMaxGlTextureSize(); + Size maxDisplaySize = GlideFilmstripManager.getMaxImageDisplaySize(); // Prefill glides bitmap pool to prevent excessive jank // when loading large images. glide.preFillBitmapPool( new PreFillType.Builder( - glTextureSize.width(), - glTextureSize.height()) + maxDisplaySize.width(), + maxDisplaySize.height()) .setWeight(5), // It's more important for jank and GC to have // A larger weight of max texture size images than |