diff options
| author | Ian Pedowitz <ijpedowitz@google.com> | 2015-11-03 21:58:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-11-03 21:58:30 +0000 |
| commit | 966d6040c6b171c75e9fb0ca942e84f9cf4d0dff (patch) | |
| tree | 5f2a9d7bacf0831db3b26fea814cd5540654f3d3 /core/java | |
| parent | 61c93eb16d91bd210948af6e812517e3c03535b4 (diff) | |
| parent | 8cee7c17119b204be88860feb812f2374d0de732 (diff) | |
Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/app/Notification.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index f3f24280d435..a2e8fd134996 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -3969,7 +3969,9 @@ public class Notification implements Parcelable @Override public void purgeResources() { super.purgeResources(); - if (mPicture != null && mPicture.isMutable()) { + if (mPicture != null && + mPicture.isMutable() && + mPicture.getAllocationByteCount() >= (128 * (1 << 10))) { mPicture = mPicture.createAshmemBitmap(); } if (mBigLargeIcon != null) { |