commit 299da86a2aeae763ccd30b90ef4fdf77b19d5a2c
author Mady Mellor <madym@google.com> Thu Oct 31 10:34:13 2019 -0700
committer Mady Mellor <madym@google.com> Thu Oct 31 10:34:13 2019 -0700
tree a348df2b3611e1a0ba42d810bf5a22ec19619823
parent 6b4ff559910efe8648ea438c184459586f943144

Force icons into adaptive shape instead of restricting them

Test: atest NotificationTest
Bug: 138943209
Change-Id: Id640ad8bd13f81d204e88739c79dec3cc68ea0ef

tests/app/src/android/app/cts/NotificationTest.java

diff --git a/tests/app/src/android/app/cts/NotificationTest.java b/tests/app/src/android/app/cts/NotificationTest.java
index 4bde253..f0235f2 100644
--- a/tests/app/src/android/app/cts/NotificationTest.java
+++ b/tests/app/src/android/app/cts/NotificationTest.java
@@ -707,23 +707,6 @@
         }
     }
 
-    public void testBubbleMetadataBuilder_throwForBitmapIcon() {
-        Bitmap b = Bitmap.createBitmap(50, 25, Bitmap.Config.ARGB_8888);
-        new Canvas(b).drawColor(0xffff0000);
-        Icon icon = Icon.createWithBitmap(b);
-
-        PendingIntent bubbleIntent = PendingIntent.getActivity(mContext, 0, new Intent(), 0);
-        try {
-            Notification.BubbleMetadata.Builder metadataBuilder =
-                    new Notification.BubbleMetadata.Builder()
-                            .setIcon(icon)
-                            .setIntent(bubbleIntent);
-            fail("Should have thrown IllegalArgumentException, invalid icon type (bitmap)");
-        } catch (IllegalArgumentException e) {
-            // expected
-        }
-    }
-
     public void testBubbleMetadataBuilder_noThrowForAdaptiveBitmapIcon() {
         Bitmap b = Bitmap.createBitmap(50, 25, Bitmap.Config.ARGB_8888);
         new Canvas(b).drawColor(0xffff0000);