commit e1a1e40358c34d66152f7a252f10f9c9f103ac94
author Michael Jurka <mikejurka@google.com> Fri Jun 22 14:42:07 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 22 14:42:07 2012 -0700
tree 8fee17dd795b38a7dd686dc1ed509351a4585700
parent cee303fac4324d32e78e3d174e256f39d70d820f
parent 037faad0f437c5fdc5435c030ef03d61de75090f

am 037faad0: am ab779e0b: Merge "Increase bitmap memory cap for widgets (Bug 6597440)" into jb-dev

* commit '037faad0f437c5fdc5435c030ef03d61de75090f':
  Increase bitmap memory cap for widgets (Bug 6597440)

services/java/com/android/server/AppWidgetServiceImpl.java

diff --git a/services/java/com/android/server/AppWidgetServiceImpl.java b/services/java/com/android/server/AppWidgetServiceImpl.java
index 7bc6a88..4d6c058 100644
--- a/services/java/com/android/server/AppWidgetServiceImpl.java
+++ b/services/java/com/android/server/AppWidgetServiceImpl.java
@@ -190,7 +190,9 @@
         WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
         int height = wm.getDefaultDisplay().getRawHeight();
         int width = wm.getDefaultDisplay().getRawWidth();
-        mMaxWidgetBitmapMemory = 4 * width * height;
+        // Cap memory usage at 1.5 times the size of the display
+        // 1.5 * 4 bytes/pixel * w * h ==> 6 * w * h
+        mMaxWidgetBitmapMemory = 6 * width * height;
     }
 
     public void systemReady(boolean safeMode) {