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

Commit 217ae4e9 authored by Kevin's avatar Kevin
Browse files

Solve inflated view/cached view inconsistency 

In a specific race condition where we free a view and clear its cached
view while that view is reinflating, we get into a scenario where the
view is null but we still have a cached view. This causes a crash if you
then try to reinflate the view. This occurs because the reinflate
updates the cache but does not update the view

In this CL, we tightly couple updates to the view in inflation so that
they always update the cache together. This way, it shouldn't be
possible for the inflated view and cached view to get out of sync.

Bug: 124387005
Test: Reproduced bug (via artificially increasing reapplyAsync latency)
and it no longer crashes.
Change-Id: Icfad13d00922d04213147fdaedb1229ab73b133c
parent b4264999

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

+20 −5
Original line number Diff line number Diff line
@@ -679,16 +679,25 @@ public class NotificationContentInflater { 
        if (runningInflations.isEmpty()) {

            if ((reInflateFlags & FLAG_CONTENT_VIEW_CONTRACTED) != 0) {

                if (result.inflatedContentView != null) {

                    // New view case

                    privateLayout.setContractedChild(result.inflatedContentView);

                }

                    cachedContentViews.put(FLAG_CONTENT_VIEW_CONTRACTED, result.newContentView);

                } else if (cachedContentViews.get(FLAG_CONTENT_VIEW_CONTRACTED) != null) {

                    // Reinflation case. Only update if it's still cached (i.e. view has not been

                    // freed while inflating).

                    cachedContentViews.put(FLAG_CONTENT_VIEW_CONTRACTED, result.newContentView);

                }

            }



            if ((reInflateFlags & FLAG_CONTENT_VIEW_EXPANDED) != 0) {

                if (result.inflatedExpandedView != null) {

                    privateLayout.setExpandedChild(result.inflatedExpandedView);

                    cachedContentViews.put(FLAG_CONTENT_VIEW_EXPANDED, result.newExpandedView);

                } else if (result.newExpandedView == null) {

                    privateLayout.setExpandedChild(null);

                    cachedContentViews.put(FLAG_CONTENT_VIEW_EXPANDED, null);

                } else if (cachedContentViews.get(FLAG_CONTENT_VIEW_EXPANDED) != null) {

                    cachedContentViews.put(FLAG_CONTENT_VIEW_EXPANDED, result.newExpandedView);

                }

                if (result.newExpandedView != null) {

                    privateLayout.setExpandedInflatedSmartReplies(
@@ -696,15 +705,18 @@ public class NotificationContentInflater { 
                } else {

                    privateLayout.setExpandedInflatedSmartReplies(null);

                }

                cachedContentViews.put(FLAG_CONTENT_VIEW_EXPANDED, result.newExpandedView);

                row.setExpandable(result.newExpandedView != null);

            }



            if ((reInflateFlags & FLAG_CONTENT_VIEW_HEADS_UP) != 0) {

                if (result.inflatedHeadsUpView != null) {

                    privateLayout.setHeadsUpChild(result.inflatedHeadsUpView);

                    cachedContentViews.put(FLAG_CONTENT_VIEW_HEADS_UP, result.newHeadsUpView);

                } else if (result.newHeadsUpView == null) {

                    privateLayout.setHeadsUpChild(null);

                    cachedContentViews.put(FLAG_CONTENT_VIEW_HEADS_UP, null);

                } else if (cachedContentViews.get(FLAG_CONTENT_VIEW_HEADS_UP) != null) {

                    cachedContentViews.put(FLAG_CONTENT_VIEW_HEADS_UP, result.newHeadsUpView);

                }

                if (result.newHeadsUpView != null) {

                    privateLayout.setHeadsUpInflatedSmartReplies(
@@ -712,14 +724,15 @@ public class NotificationContentInflater { 
                } else {

                    privateLayout.setHeadsUpInflatedSmartReplies(null);

                }

                cachedContentViews.put(FLAG_CONTENT_VIEW_HEADS_UP, result.newHeadsUpView);

            }



            if ((reInflateFlags & FLAG_CONTENT_VIEW_PUBLIC) != 0) {

                if (result.inflatedPublicView != null) {

                    publicLayout.setContractedChild(result.inflatedPublicView);

                }

                    cachedContentViews.put(FLAG_CONTENT_VIEW_PUBLIC, result.newPublicView);

                } else if (cachedContentViews.get(FLAG_CONTENT_VIEW_PUBLIC) != null) {

                    cachedContentViews.put(FLAG_CONTENT_VIEW_PUBLIC, result.newPublicView);

                }

            }



            if ((reInflateFlags & FLAG_CONTENT_VIEW_AMBIENT) != 0) {
@@ -730,8 +743,10 @@ public class NotificationContentInflater { 
                            ? publicLayout : privateLayout;

                    newParent.setAmbientChild(result.inflatedAmbientView);

                    otherParent.setAmbientChild(null);

                }

                    cachedContentViews.put(FLAG_CONTENT_VIEW_AMBIENT, result.newAmbientView);

                } else if (cachedContentViews.get(FLAG_CONTENT_VIEW_AMBIENT) != null) {

                    cachedContentViews.put(FLAG_CONTENT_VIEW_AMBIENT, result.newAmbientView);

                }

            }

            entry.headsUpStatusBarText = result.headsUpStatusBarText;

            entry.headsUpStatusBarTextPublic = result.headsUpStatusBarTextPublic;