Fix scaling of layout bounds.

Change-Id: I9d8c8924900fed69030ee3e8d6decee89ca67820

1 files changed, 8 insertions, 0 deletions

diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java
index 1599e40..5094df18 100644
--- a/graphics/java/android/graphics/BitmapFactory.java
+++ b/graphics/java/android/graphics/BitmapFactory.java
@@ -556,6 +556,7 @@ public class BitmapFactory {
             return bm;
         }
         byte[] np = bm.getNinePatchChunk();
+        int[] lb = bm.getLayoutBounds();
         final boolean isNinePatch = np != null && NinePatch.isNinePatchChunk(np);
         if (opts.inScaled || isNinePatch) {
             float scale = targetDensity / (float) density;
@@ -569,6 +570,13 @@ public class BitmapFactory {
                     np = nativeScaleNinePatch(np, scale, outPadding);
                     bm.setNinePatchChunk(np);
                 }
+                if (lb != null) {
+                    int[] newLb = new int[lb.length];
+                    for (int i=0; i<lb.length; i++) {
+                        newLb[i] = (int)((lb[i]*scale)+.5f);
+                    }
+                    bm.setLayoutBounds(newLb);
+                }
             }
 
             bm.setDensity(targetDensity);