From c7652791f7cab9df35ef0832f3070eea49dd5fdd Mon Sep 17 00:00:00 2001
From: Selim Cinek <cinek@google.com>
Date: Mon, 9 Jan 2017 16:12:12 +0100
Subject: [PATCH] Fixed a crash when a notification is updated

Under certain conditions, the minheight could be
queried while reset or when an inflation error happened
for an existing notification.
Since all notifications have collapsed layout anyway
that will always be set after reset, we don't have
to null those out.

Test: click clear all, have first notification update during the animation.
Bug: 32333389
Fixes: 33961825
Change-Id: I14a75cd628726c8acd892a81b95de40f92275bb1
---
 .../android/systemui/statusbar/NotificationContentView.java  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
index ad6a5dbfd8188..9ce211539ad95 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java
@@ -293,10 +293,6 @@ public class NotificationContentView extends FrameLayout {
     }
 
     public void reset() {
-        if (mContractedChild != null) {
-            mContractedChild.animate().cancel();
-            removeView(mContractedChild);
-        }
         mPreviousExpandedRemoteInputIntent = null;
         if (mExpandedRemoteInput != null) {
             mExpandedRemoteInput.onNotificationUpdateOrReset();
@@ -327,7 +323,6 @@ public class NotificationContentView extends FrameLayout {
             removeView(mHeadsUpChild);
             mHeadsUpRemoteInput = null;
         }
-        mContractedChild = null;
         mExpandedChild = null;
         mHeadsUpChild = null;
     }