Patch androidx.core.NotificationCompat.BubbleMetadata.toPlatform

android · Apr 25, 2024 · 596d9b5 · 596d9b5
1 parent 21d4562
commit 596d9b5
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/app/src/main/java/androidx/core/NotificationCompat.java b/app/src/main/java/androidx/core/NotificationCompat.java
@@ -8496,14 +8496,15 @@ public void setFlags(int flags) {
          * is non-null, otherwise null.
          */
         public static @Nullable android.app.Notification.BubbleMetadata toPlatform(
-                @Nullable BubbleMetadata compatMetadata) {
+                @Nullable BubbleMetadata compatMetadata,
+                @NonNull Context context) {
             if (compatMetadata == null) {
                 return null;
             }
             if (Build.VERSION.SDK_INT >= 30) {
-                return Api30Impl.toPlatform(compatMetadata);
+                return Api30Impl.toPlatform(compatMetadata, context);
             } else if (Build.VERSION.SDK_INT == 29) {
-                return Api29Impl.toPlatform(compatMetadata);
+                return Api29Impl.toPlatform(compatMetadata, context);
             }
             return null;
         }
@@ -8779,7 +8780,8 @@ private Api29Impl() {
              */
             @RequiresApi(29)
             @Nullable static android.app.Notification.BubbleMetadata toPlatform(
-                    @Nullable BubbleMetadata compatMetadata) {
+                    @Nullable BubbleMetadata compatMetadata,
+                    @NonNull Context context) {
                 if (compatMetadata == null) {
                     return null;
                 }
@@ -8790,7 +8792,7 @@ private Api29Impl() {
 
                 android.app.Notification.BubbleMetadata.Builder platformMetadataBuilder =
                         new android.app.Notification.BubbleMetadata.Builder()
-                                .setIcon(compatMetadata.getIcon().toIcon())
+                                .setIcon(compatMetadata.getIcon().toIcon(context))
                                 .setIntent(compatMetadata.getIntent())
                                 .setDeleteIntent(compatMetadata.getDeleteIntent())
                                 .setAutoExpandBubble(compatMetadata.getAutoExpandBubble())
@@ -8862,7 +8864,8 @@ private Api30Impl() {
              */
             @RequiresApi(30)
             @Nullable static android.app.Notification.BubbleMetadata toPlatform(
-                    @Nullable BubbleMetadata compatMetadata) {
+                    @Nullable BubbleMetadata compatMetadata,
+                    @NonNull Context context) {
                 if (compatMetadata == null) {
                     return null;
                 }
@@ -8874,7 +8877,7 @@ private Api30Impl() {
                 } else {
                     platformMetadataBuilder =
                             new android.app.Notification.BubbleMetadata.Builder(
-                                    compatMetadata.getIntent(), compatMetadata.getIcon().toIcon());
+                                    compatMetadata.getIntent(), compatMetadata.getIcon().toIcon(context));
                 }
                 platformMetadataBuilder
                         .setDeleteIntent(compatMetadata.getDeleteIntent())