diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-11-03 22:05:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-11-03 22:05:23 +0000 |
| commit | 95fc53b0293a6361c7ff8a412897a869f07664c6 (patch) | |
| tree | 50627d97ac459b6db9090fa4c92f8b91ed6db5e0 /core/jni | |
| parent | a66dc6e159bd8f4997a9253d5590807c02358d84 (diff) | |
| parent | 966d6040c6b171c75e9fb0ca942e84f9cf4d0dff (diff) | |
| download | frameworks_base-95fc53b0293a6361c7ff8a412897a869f07664c6.zip frameworks_base-95fc53b0293a6361c7ff8a412897a869f07664c6.tar.gz frameworks_base-95fc53b0293a6361c7ff8a412897a869f07664c6.tar.bz2 | |
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
am: 966d6040c6
* commit '966d6040c6b171c75e9fb0ca942e84f9cf4d0dff':
Limit persistent ashmem backed fds to a minimum of 128kB.
Diffstat (limited to 'core/jni')
| -rwxr-xr-x | core/jni/android/graphics/Bitmap.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index fbe3ece..6cbdeaa 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -28,6 +28,7 @@ #include <cutils/ashmem.h> #define DEBUG_PARCEL 0 +#define ASHMEM_BITMAP_MIN_SIZE (128 * (1 << 10)) namespace android { @@ -993,7 +994,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) { // Map the bitmap in place from the ashmem region if possible otherwise copy. Bitmap* nativeBitmap; - if (blob.fd() >= 0 && (blob.isMutable() || !isMutable)) { + if (blob.fd() >= 0 && (blob.isMutable() || !isMutable) && (size >= ASHMEM_BITMAP_MIN_SIZE)) { #if DEBUG_PARCEL ALOGD("Bitmap.createFromParcel: mapped contents of %s bitmap from %s blob " "(fds %s)", |