Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Do not reinflate the layout if it has not been already inflated.

Browse Source 
This fixes the NPE caused when reinflate method is called before the
layout is inflated.

Bug: 180534861
Test: Manual
Change-Id: Ia3fb6867e55c63a5fe7c17df1c3f86d048b4d1a8
This commit is contained in:
kwaky
2021-03-08 10:05:57 -08:00
parent c1665ffb62
commit b700beab66
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/CarSystemUI/src/com/android/systemui/car/notification/NotificationPanelViewController.java
View File

@@ -240,6 +240,9 @@ public class NotificationPanelViewController extends OverlayPanelViewController
/** Reinflates the view. */ /** Reinflates the view. */
public void reinflate() { public void reinflate() {
// Do not reinflate the view if it has not been inflated at all.
if (!isInflated()) return;
ViewGroup container = (ViewGroup) getLayout(); ViewGroup container = (ViewGroup) getLayout();
container.removeView(mNotificationView); container.removeView(mNotificationView);