From a2dbe43122f5f8cb72d21ab4c9e7a9d570ba5d2e Mon Sep 17 00:00:00 2001
From: Riley Andrews <riandrews@android.com>
Date: Sun, 1 Nov 2015 23:36:04 -0800
Subject: Limit persistent ashmem backed fds to a minimum of 128kB.

Bug 25256717

Change-Id: Ieb356006df0a6545b89de44d3d8fd4b46312b3b8
Signed-off-by: Riley Andrews <riandrews@google.com>
---
 graphics/java/android/graphics/drawable/Icon.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'graphics')

diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java
index 26232a9..44d7530 100644
--- a/graphics/java/android/graphics/drawable/Icon.java
+++ b/graphics/java/android/graphics/drawable/Icon.java
@@ -382,7 +382,9 @@ public final class Icon implements Parcelable {
      * @hide
      */
     public void convertToAshmem() {
-        if (mType == TYPE_BITMAP && getBitmap().isMutable()) {
+        if (mType == TYPE_BITMAP &&
+            getBitmap().isMutable() &&
+            getBitmap().getAllocationByteCount() >= (128 * (1 << 10))) {
             setBitmap(getBitmap().createAshmemBitmap());
         }
     }
-- 
cgit v1.1