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

Commit ed06fa83 authored by Julia Tuttle's avatar Julia Tuttle
Browse files

Return early from finishIfDone if not done 

Refactor this method so it's not basically one giant if statement.

Bug: 308967184
Test: NA
Flag: NA
Change-Id: I0e8680c87caa7f47a0f4cf6635d0de58b4b9f658
parent 755f4e37

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) {