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

Commit bdae1060 authored by Jeff DeCew's avatar Jeff DeCew Committed by Automerger Merge Worker
Browse files

Merge "Log when child views are freed" into tm-qpr-dev am: 4355e016 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19510756



Change-Id: I0b165e2f457ffc8aca29223aa338ca6472ddffd5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6bff654e 4355e016

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinator.java

+3 −2
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ public class PreparationCoordinator implements Coordinator { 
                if (isInflated(child)) {

                    // TODO: May want to put an animation hint here so view manager knows to treat

                    //  this differently from a regular removal animation

                    freeNotifViews(child);

                    freeNotifViews(child, "Past last visible group child");

                }

            }

        }
@@ -379,7 +379,8 @@ public class PreparationCoordinator implements Coordinator { 
        mNotifInflatingFilter.invalidateList("onInflationFinished for " + logKey(entry));

    }



    private void freeNotifViews(NotificationEntry entry) {

    private void freeNotifViews(NotificationEntry entry, String reason) {

        mLogger.logFreeNotifViews(entry, reason);

        mViewBarn.removeViewForEntry(entry);

        mNotifInflater.releaseViews(entry);

        // TODO: clear the entry's row here, or even better, stop setting the row on the entry!

packages/SystemUI/src/com/android/systemui/statusbar/notification/collection/coordinator/PreparationCoordinatorLogger.kt

+12 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class PreparationCoordinatorLogger @Inject constructor( 
        buffer.log(TAG, LogLevel.DEBUG, {

            str1 = entry.logKey

        }, {

            "NOTIF INFLATED $str1"

            "Inflation completed for notif $str1"

        })

    }
@@ -40,7 +40,16 @@ class PreparationCoordinatorLogger @Inject constructor( 
            str1 = entry.logKey

            str2 = reason

        }, {

            "NOTIF INFLATION ABORTED $str1 reason=$str2"

            "Infation aborted for notif $str1 reason=$str2"

        })

    }



    fun logFreeNotifViews(entry: NotificationEntry, reason: String) {

        buffer.log(TAG, LogLevel.DEBUG, {

            str1 = entry.logKey

            str2 = reason

        }, {

            "Freeing content views for notif $str1 reason=$str2"

        })

    }