Merge "AdaptiveIconDrawable should not update layer bounds when bound is empty" into oc-dr1-dev

am: e54ad58aea Change-Id: I01b6fd2391e1296546291af5db5a4663e67fae01
2017-06-29 19:27:30 +00:00
parent e3a9c1e1e4 e54ad58aea
commit 73035910fc
1 changed files with 4 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
+++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
@@ -289,6 +289,9 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback
    }

    private void updateLayerBounds(Rect bounds) {
+        if (bounds.isEmpty()) {
+            return;
+        }
        try {
            suspendChildInvalidation();
            updateLayerBoundsInternal(bounds);
@@ -1109,4 +1112,4 @@ public class AdaptiveIconDrawable extends Drawable implements Drawable.Callback
            mCheckedStateful = false;
        }
    }
-}
+}