commit e54ad58aea33860fbb36bf828684e3df6393f602
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 29 19:18:52 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 29 19:18:52 2017 +0000
tree 3c2028e5fe9a77bc0e338b404091baad7b480b90
parent 98b181b25f6d88d200f61a082dec86aad0d703c0
parent dba9934fb789d67bbd305aa384bf5917a001e715

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

graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java

diff --git a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
index 8616d58..1d0cfa5 100644
--- a/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
+++ b/graphics/java/android/graphics/drawable/AdaptiveIconDrawable.java
@@ -289,6 +289,9 @@
     }
 
     private void updateLayerBounds(Rect bounds) {
+        if (bounds.isEmpty()) {
+            return;
+        }
         try {
             suspendChildInvalidation();
             updateLayerBoundsInternal(bounds);
@@ -1109,4 +1112,4 @@
             mCheckedStateful = false;
         }
     }
-}
\ No newline at end of file
+}