commit cf0fd115d23746147fd00d17df914e6a6a6615ac
author Hyunyoung Song <hyunyoungs@google.com> Tue Jun 27 16:56:41 2017 -0700
committer JP Sugarbroad <jpsugar@google.com> Tue Feb 13 14:09:07 2018 -0800
tree f27af327712fe23efc70a341c85fd4d4afa9e847
parent f193d6a9202114d503946b6527af764956da1b2b

AdaptiveIconDrawable should not update layer bounds when bound is empty

Test: build succeeds. Also, setting tint mode does not result in error.

Bug: 37682281
Bug: 69969749
Change-Id: I5991b8e58514a2130a793a5edb90baeafae9b148
(cherry picked from commit 8980958454ced6db001452e1f5f5811a944716d4)

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
+}