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

Commit 970dd095 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "Return early from finishIfDone if not done" into main

parents d7621874 ed06fa83

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentInflater.java

+117 −117
Original line number Diff line number Diff line
@@ -833,9 +833,11 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
            @Nullable InflationCallback endListener, NotificationEntry entry,

            ExpandableNotificationRow row, NotificationContentInflaterLogger logger) {

        Assert.isMainThread();

        if (!runningInflations.isEmpty()) {

            return false;

        }

        NotificationContentView privateLayout = row.getPrivateLayout();

        NotificationContentView publicLayout = row.getPublicLayout();

        if (runningInflations.isEmpty()) {

        logger.logAsyncTaskProgress(entry, "finishing");

        boolean setRepliesAndActions = true;

        if ((reInflateFlags & FLAG_CONTENT_VIEW_CONTRACTED) != 0) {
@@ -969,8 +971,6 @@ public class NotificationContentInflater implements NotificationRowContentBinder 
        }

        return true;

    }

        return false;

    }



    private static RemoteViews createExpandedView(Notification.Builder builder,

            boolean isLowPriority) {