Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9e0ead0 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh
Browse files

Updates Icon type checks in framework to include TYPE_URI_ADAPTIVE_BITMAP 

Bug: 142831407
Test: atest RemoteViewsTest StatusBarIconViewTest
Change-Id: If55935a194d1e4fb22c5afe1ee102e5b167b0d1d
parent 3df3e3b0

core/java/android/widget/RemoteViews.java

+2 −1
Original line number Diff line number Diff line
@@ -565,7 +565,8 @@ public class RemoteViews implements Parcelable, Filter { 
    }



    private static void visitIconUri(Icon icon, @NonNull Consumer<Uri> visitor) {

        if (icon != null && icon.getType() == Icon.TYPE_URI) {

        if (icon != null && (icon.getType() == Icon.TYPE_URI

                || icon.getType() == Icon.TYPE_URI_ADAPTIVE_BITMAP)) {

            visitor.accept(icon.getUri());

        }

    }

packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java

+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ public class StatusBarIconView extends AnimatedImageView implements StatusIconDi 
            case Icon.TYPE_RESOURCE:

                return a.getResPackage().equals(b.getResPackage()) && a.getResId() == b.getResId();

            case Icon.TYPE_URI:

            case Icon.TYPE_URI_ADAPTIVE_BITMAP:

                return a.getUriString().equals(b.getUriString());

            default:

                return false;